Development December 2017

development@lists.ipfire.org

5 participants
28 discussions

[PATCH] mark 3DES and 1024 bit DH params as weak
by Peter Müller 10 Dec '17

10 Dec '17

These are not considered secure anymore but are unfortunately still needed in some cases (legacy hardware, ...). Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ceb88c156..638e8ef0f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1320,7 +1320,7 @@ END <form method='post'><input type='hidden' name='AREUSURE' value='yes' /> <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' /> <select name='DHLENGHT'> - <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'}</option> + <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'})</option> <option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option> <option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option> <option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option> diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index d6f6ecb33..3e8d1ef03 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2470,7 +2470,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <option value='aes128gcm64' $checked{'IKE_ENCRYPTION'}{'aes128gcm64'}>128 bit AES-GCM/64 bit ICV</option> <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>128 bit AES-CBC</option> <option value='camellia128' $checked{'IKE_ENCRYPTION'}{'camellia128'}>128 bit Camellia-CBC</option> - <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC</option> + <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC ($Lang::tr{'vpn weak'})</option> </select> </td> <td class='boldbase'> @@ -2490,7 +2490,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <option value='aes128gcm64' $checked{'ESP_ENCRYPTION'}{'aes128gcm64'}>128 bit AES-GCM/64 bit ICV</option> <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>128 bit AES-CBC</option> <option value='camellia128' $checked{'ESP_ENCRYPTION'}{'camellia128'}>128 bit Camellia-CBC</option> - <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC</option> + <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC ($Lang::tr{'vpn weak'})</option> </select> </td> </tr> -- 2.13.6

1 0

[PATCH] update german translations
by Peter Müller 10 Dec '17

10 Dec '17

Correct some grammar errors and unify spelling of interface names (GREEN vs. GRÜN). Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- langs/de/cgi-bin/de.pl | 74 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f87071db7..a10cfa15b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -90,7 +90,7 @@ 'Level7 Protocol' => 'Level7-Protokoll', 'Level7 Rule' => 'Level7-Regel', 'Level7 rule' => 'Level7-Regel', -'Local VPN IP' => 'Internes Netzwerk (GREEN)', +'Local VPN IP' => 'Internes Netzwerk (GRÜN)', 'MB read' => 'MB gelesen', 'MB written' => 'MB geschrieben', 'MTU' => 'MTU-Größe:', @@ -110,7 +110,7 @@ 'Resolv' => 'Resolv-Retry', 'Scan for Files' => 'Nach Dateien suchen', 'Scan from Directory' => 'Scan Verzeichnis', -'Set time on boot' => 'Erzwinge das Setzen der Systemzeit im Bootvorgang', +'Set time on boot' => 'Erzwinge das Setzen der Systemzeit während des Bootvorgangs', 'Subclass' => 'Unterklasse', 'TOS Bits' => 'TOS-Bits', 'TOS Rule' => 'TOS-Regel', @@ -343,8 +343,8 @@ 'advproxy no clients defined' => 'Keine Clients definiert', 'advproxy no connection auth' => 'Keine verbindungsorientierte Authentifizierungsweiterleitung', 'advproxy no cre groups' => 'Es sind keine Zugriffsgruppen verfügbar', -'advproxy no internal proxy on blue' => ' Deaktiviere internen Proxy von Blue in andere Subnetze', -'advproxy no internal proxy on green' => 'Deaktiviere internen Proxy nach Green aus anderen Subnetzen', +'advproxy no internal proxy on blue' => ' Deaktiviere internen Proxy von BLAU in andere Subnetze', +'advproxy no internal proxy on green' => 'Deaktiviere internen Proxy nach GRÜN aus anderen Subnetzen', 'advproxy number of L1 dirs' => 'Anzahl der Level-1 Unterverzeichnisse', 'advproxy off' => 'Proxy aus', 'advproxy offline mode' => 'Aktiviere Offline-Modus', @@ -357,7 +357,7 @@ 'advproxy reset' => 'Zurücksetzen', 'advproxy saturday' => 'Sa', 'advproxy save and restart' => 'Speichern und Neustart', -'advproxy squid version' => 'Squid Cache Version', +'advproxy squid version' => 'Squid Versionsnummer', 'advproxy squidclamav' => 'SquidClamav', 'advproxy ssadvanced proxy' => 'advanced proxy', 'advproxy ssl ports' => 'Zulässige SSL-Ports (einer pro Zeile)', @@ -453,7 +453,7 @@ 'backup sets' => 'Datensicherungssätze', 'backup to floppy' => 'Datensicherung auf Diskette', 'backupaddon' => 'Addonsicherung', -'backupprofile' => 'Falls die Wiederverbindung scheitert, auf Profil umschalten', +'backupprofile' => 'Falls die Wiederverbindung scheitert, auf dieses Profil umschalten', 'backups' => 'Sicherungen', 'backupwarning' => 'Bitte stellen Sie zuerst Ihre Hauptsicherung wieder her und anschließend die Addons. Achten Sie darauf, dass die Sicherungen ihre originalen Dateinamen behalten.', 'bad characters in' => 'Ungültige Zeichen in ', @@ -474,7 +474,7 @@ 'bleeding rules' => 'Bleeding Edge Snort Rules', 'block' => 'Blocken', 'blue' => 'BLAU', -'blue access' => 'Zugriff auf Blau', +'blue access' => 'Zugriff auf BLAU', 'blue access use hint' => 'Sie müssen mindestens die MAC- oder die IP-Adresse für ein Gerät angeben. Optional können Sie sowohl MAC- als auch IP-Adresse angeben.', 'blue interface' => 'Blaues Interface', 'broadcast' => 'Broadcast', @@ -582,7 +582,7 @@ 'ccd used' => 'Genutzte Adressen', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', -'certificate authorities' => 'Zertifizierungsstellen und -Schlüssel', +'certificate authorities' => 'Zertifizierungsstellen und -schlüssel', 'certificate does not have a valid ca associated with it' => 'Mit dem Zertifikat ist keine gültige CA verbunden.', 'certificate file move failed' => 'Verschieben der Zertifikatsdatei fehlgeschlagen', 'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.', @@ -619,7 +619,7 @@ 'connection' => 'Verbindung', 'connection closed' => 'Nicht Verbunden...', 'connection debugging' => 'Verbindungs-Debugging', -'connection status and controlc' => 'Verbindungsstatus und -Kontrolle', +'connection status and controlc' => 'Verbindungsstatus und -kontrolle', 'connection tracking' => 'iptables-Verbindungsverfolgung', 'connection type' => 'Verbindungstyp', 'connection type is invalid' => 'Verbindungstyp ist ungültig', @@ -665,7 +665,7 @@ 'current aliases' => 'Aktuelle Alias-Adresse', 'current class' => 'Aktuelle Klasse', 'current devices' => 'Schnittstellen', -'current dhcp leases on blue' => 'Aktuelle DHCP-Zuordnungen auf Blau', +'current dhcp leases on blue' => 'Aktuelle DHCP-Zuordnungen auf BLAU', 'current dynamic leases' => 'Aktuelle dynamische Zuordnungen', 'current fixed leases' => 'Aktuelle feste Zuordnungen', 'current hosts' => 'Aktuelle Hosts', @@ -702,7 +702,7 @@ 'def lease time' => 'Standardzeit für Zuordnung', 'default' => 'Voreinstellung', 'default ip' => 'Standard IP-Adresse', -'default lease time' => 'Haltezeit-Voreinstellung in min:', +'default lease time' => 'Haltezeit-Voreinstellung (Min.):', 'default networks' => 'Standard Netzwerke', 'default renewal time' => 'Standard-Aktualisierungszeit', 'default services' => 'Standard Dienste', @@ -727,7 +727,7 @@ 'detail level' => 'Detaillierungsgrad', 'details' => 'Mehr', 'device' => 'Gerät', -'devices on blue' => 'Geräte auf Blau', +'devices on blue' => 'Geräte auf BLAU', 'dh' => 'Diffie-Hellman-Parameter', 'dh key move failed' => 'Verschieben der Diffie-Hellman-Parameter fehlgeschlagen.', 'dh key warn' => 'Das Generieren der DH-Parameter mit 1024 oder 2048 Bit dauert üblicherweise mehrere Minuten. Schlüssellängen von 3072 oder 4096 Bit beanspruchen mehrere Stunden. Bitte haben Sie etwas Geduld.', @@ -756,10 +756,10 @@ 'dhcp configuration' => 'DHCP-Konfiguration', 'dhcp create fixed leases' => 'Feste Zuordnungen erzeugen', 'dhcp dns enable update' => 'DNS-Update (RFC2136) aktivieren:', -'dhcp dns key name' => 'Schlüsselname:', +'dhcp dns key name' => 'Schlüsselname', 'dhcp dns update' => 'DNS-Update', -'dhcp dns update algo' => 'Algorithmus:', -'dhcp dns update secret' => 'Schlüssel:', +'dhcp dns update algo' => 'Algorithmus', +'dhcp dns update secret' => 'Schlüssel', 'dhcp fixed lease err1' => 'Für eine feste Zuordnung müssen entweder die Hardware Adresse (MAC-Adresse) oder der Hostname oder beide eingetragen werden.', 'dhcp fixed lease help1' => 'IP Adressen können als FQDN angegeben werden.', 'dhcp mode' => 'DHCP', @@ -772,7 +772,7 @@ 'dial user password' => 'Passwort für Benutzer "dial":', 'dial user password has been changed' => 'Passwort für Benutzer -dial- wurde geändert.', 'dialing mode' => 'Wählmodus:', -'dialup red not ppp' => 'Einwahl Profile können nur verwendet werden wenn <b>RED</b> auf <b>PPP Einwahl</b> eingestellt ist. <BR>Bitte die Netzwerkeinstellungen prüfen.', +'dialup red not ppp' => 'Einwahl Profile können nur verwendet werden wenn <b>ROT</b> auf <b>PPP Einwahl</b> eingestellt ist. <BR>Bitte die Netzwerkeinstellungen prüfen.', 'dialup settings' => 'Einwahl-Einstellungen', 'directory mask' => 'UNIX Verzeichnis Rechte', 'directory writeable' => 'Verzeichnis schreibbar', @@ -1168,7 +1168,7 @@ 'fwhost any' => 'Alle', 'fwhost attention' => 'ACHTUNG', 'fwhost back' => 'Zurück', -'fwhost blue' => 'Blau', +'fwhost blue' => 'BLAU', 'fwhost ccdhost' => 'OpenVPN-Clients:', 'fwhost ccdnet' => 'OpenVPN-Netzwerke:', 'fwhost change' => 'Ändern', @@ -1213,7 +1213,7 @@ 'fwhost err srv exists' => 'Ein Service mit diesem Namen existiert bereits', 'fwhost err srvexist' => 'Dieser Dienst ist bereits in der Gruppe', 'fwhost err sub32' => 'Bitte Netzwerke hinzufügen, keinen einzelnen Host', -'fwhost green' => 'Grün', +'fwhost green' => 'GRÜN', 'fwhost hint' => 'Hinweis', 'fwhost hosts' => 'Firewall-Hosts', 'fwhost icmptype' => 'ICMP-Typ:', @@ -1229,7 +1229,7 @@ 'fwhost newnet' => 'Netzwerke', 'fwhost newservice' => 'Dienst', 'fwhost newservicegrp' => 'Dienstgruppen', -'fwhost orange' => 'Orange', +'fwhost orange' => 'ORANGE', 'fwhost ovpn_n2n' => 'OpenVPN Net-to-Net', 'fwhost port' => 'Port(s)', 'fwhost prot' => 'Protokoll', @@ -1293,7 +1293,7 @@ 'high' => 'Hoch', 'high memory usage' => 'Speicher wird knapp', 'hint' => 'Tipp', -'holdoff' => 'Holdoff-Zeit in (Sekunden)', +'holdoff' => 'Holdoff-Zeit (Sek.)', 'host' => 'Host', 'host allow' => 'Liste der Zugriffsberechtigten', 'host certificate' => 'Host-Zertifikat', @@ -1316,7 +1316,7 @@ 'icmp type' => 'ICMP-Typ', 'id' => 'ID', 'idle' => 'Leerlauf', -'idle timeout' => 'Leerlauf-Wartezeit in min (0 zum Deaktivieren):', +'idle timeout' => 'Leerlauf-Wartezeit in Min. (0 zum Deaktivieren):', 'idle timeout not set' => 'Leerlauf-Wartezeit nicht angegeben.', 'ids log viewer' => 'Ansicht IDS-Protokoll', 'ids logs' => 'IDS-Protokolldateien', @@ -1359,9 +1359,9 @@ 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', 'intrusion detection' => 'Einbruchdetektierung', -'intrusion detection system' => 'Intrusion Detection System', +'intrusion detection system' => 'Einbruchsdetektierung', 'intrusion detection system log viewer' => 'Betrachter der IDS-Protokolldateien', -'intrusion detection system rules' => 'Intrusion Detection System Regeln', +'intrusion detection system rules' => 'Regeln für die Einbruchsdetektierung', 'intrusion detection system2' => 'Intrusion Detection System:', 'invalid broadcast ip' => 'Ungültige Broadcast-IP', 'invalid cache size' => 'Ungültige Cache-Größe.', @@ -1443,7 +1443,7 @@ 'ipfires hostname' => 'IPFire\'s Hostname', 'ipinfo' => 'IP-Info', 'ipsec' => 'IPsec', -'ipsec network' => 'IPsec-Netzwerke', +'ipsec network' => 'IPsec-Netzwerk', 'ipsec no connections' => 'Keine aktiven IPsec-Verbindungen', 'iptable rules' => 'IPTable-Regeln', 'iptmangles' => 'IPTable Mangles', @@ -1551,14 +1551,14 @@ 'march' => 'März', 'marked' => 'Markiert', 'masquerade blue' => 'NAT auf BLAU', -'masquerade green' => 'NAT auf GREEN', +'masquerade green' => 'NAT auf GRÜN', 'masquerade orange' => 'NAT auf ORANGE', 'masquerading' => 'Masquerading/NAT', 'masquerading disabled' => 'NAT ausgeschaltet', 'masquerading enabled' => 'NAT eingeschaltet', 'max bandwith' => 'Maximale Bandbreite', 'max incoming size' => 'Max. eingehende Größe (kB):', -'max lease time' => 'Max. Haltezeit in min.:', +'max lease time' => 'Max. Haltezeit (Min.):', 'max outgoing size' => 'Max. abgehende Größe (kB):', 'max reliability' => 'Maximale Zuverlässigkeit', 'max renewal time' => 'Maximale Aktualisierungszeit', @@ -1659,7 +1659,7 @@ 'net address' => 'Netzadresse', 'net config' => 'Netzwerk-Konfiguration', 'net config type' => 'Netzwerk-Konfigurations-Typ', -'net config type help' => 'GREEN ist das lokale Netzwerk, RED ist das Internet, BLUE ist WLAN, ORANGE ist die DMZ.', +'net config type help' => 'GRÜN ist das lokale Netzwerk, ROT das Internet, BLAU das WLAN, ORANGE die DMZ.', 'net to net vpn' => 'Netz-zu-Netz Virtual Private Network', 'net traffic newversion' => 'Es ist eine neue Net-Traffic Version verfügbar:', 'net-traffic configuration' => 'Net-Traffic Konfiguration', @@ -1919,7 +1919,7 @@ 'prefered master' => 'Prefered Master', 'present' => 'Vorhanden', 'prev' => 'Vorheriger', -'primary dns' => 'Primärer DNS:', +'primary dns' => 'Primärer DNS-Server:', 'primary ntp server' => 'Primärer NTP-Server', 'primary wins server address' => 'Primäre WINS-Server Adresse', 'printcap name' => 'Printercap Name', @@ -2013,7 +2013,7 @@ 'resetglobals' => 'Globale Einstellungen zurücksetzen', 'resetpolicy' => 'Richtlinie zurücksetzen', 'resetshares' => 'Shares zurücksetzen?', -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Löschen des X509 wird die Root-CA, die Host-Zertifikate und alle zertifikatsbasierten Verbindungen entfernen.', +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Löschen des X509 wird die Root-CA, die Host-Zertifikate und alle zertifikatsbasierten Verbindungen entfernen', 'restart' => 'Neustart', 'restart ovpn server' => 'OpenVPN-Server neu starten', 'restore' => 'Wiederherstellen', @@ -2045,10 +2045,10 @@ 'save-adv-options' => 'Erweiterte Optionen speichern', 'script name' => 'Skriptname:', 'search' => 'Suchen', -'secondary dns' => 'Sekundärer DNS:', +'secondary dns' => 'Sekundärer DNS-Server:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundäre WINS-Server Adresse', -'seconds' => 'sek.', +'seconds' => 'Sek.', 'section' => 'Abschnitt', 'secure shell server' => 'Secure Shell Server', 'security' => 'Sicherheit', @@ -2676,12 +2676,12 @@ 'volup5' => 'Laustärke um 5 erhöhen', 'vpi number' => 'VPI-Nummer:', 'vpn' => 'VPN', -'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Wenn möglich, vermeiden (preshared Schlüssel wird im Klartext übertragen)!', +'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Möglichst vermeiden (preshared Schlüssel wird im Klartext übertragen)!', 'vpn altname syntax' => 'Der Subjekt Alternativ Name ist eine durch Komma getrennte Liste von Email, DNS, URI, RID und IP Objekten. <br />Email: eine Email Adresse. Syntax Email: \'copy\' benutzt die Email Adresse aus dem Zertifikatfeld. <br />DNS: ein gültiger Domain Name.<br />URI: eine gültige URI.<br />RID: Registriertes Objekt Identifikation.<br />IP: eine IP Adresse.<br />Bitte beachten: der Zeichensatz ist eingeschränkt und die Groß-/Kleinschreibung ist entscheidend.<br />Beispiel:<br /><b>email:</b>info(a)ipfire.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/nach/irgendwo', 'vpn auth-dn' => 'Peer wird identifiziert durch entweder ein IPV4_ADDR, FQDN, USER_FQDN oder DER_ASN1_DN string in Remote ID Feld', -'vpn broken' => 'Gebrochen', +'vpn broken' => 'gebrochen', 'vpn connecting' => 'VERBINDUNGSAUFBAU', -'vpn delayed start' => 'Verzögerung, bevor VPN gestartet wird (in Sekunden)', +'vpn delayed start' => 'Verzögerung, bevor VPN gestartet wird (Sek.)', 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.', 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig', 'vpn keyexchange' => 'Schlüsseltausch', @@ -2703,7 +2703,7 @@ 'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn subjectaltname' => 'Subjekt Alternativer Name', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', -'vpn weak' => 'Schwach', +'vpn weak' => 'schwach', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', 'warn when traffic reaches' => 'Warnen wenn Traffic x % erreicht', 'warning messages' => 'Warnhinweise', @@ -2720,8 +2720,8 @@ 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', -'wins server' => 'Wins-Server', -'wins support' => 'Wins-Support', +'wins server' => 'WINS-Server', +'wins support' => 'WINS-Support', 'wireless' => 'Wireless', 'wireless config added' => 'Wireless-Konfiguration hinzugefügt', 'wireless config changed' => 'Wireless-Konfiguration geändert', -- 2.13.6

1 0

[PATCH] submit fireinfo profile via HTTPS
by Peter Müller 09 Dec '17

09 Dec '17

Since HTTPS is now available for fireinfo.ipfire.org, clients should submit their profiles with transport encryption. Fixes #11529. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- src/sendprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sendprofile b/src/sendprofile index da480ce..b836567 100644 --- a/src/sendprofile +++ b/src/sendprofile @@ -44,7 +44,7 @@ log.addHandler(logging.StreamHandler(sys.stderr)) for handler in log.handlers: handler.setLevel(log_level) -PROFILE_URL = "http://fireinfo.ipfire.org/send/%(public_id)s" +PROFILE_URL = "https://fireinfo.ipfire.org/send/%(public_id)s" def get_upstream_proxy(): if not os.path.exists(PROXY_SETTINGS): -- 2.13.6

1 0

[PATCH] Revived (as addon): squid graphs 3.2 (V2) - based on the original sources, adapted and patched for IPFire
by Matthias Fischer 09 Dec '17

09 Dec '17

Hi, This is 'squid-graph 3.2' - for details see: https://sourceforge.net/projects/squid-graph/ "Squid Graph is a free, simple, yet powerful Squid v2 native logfile analysis tool that generates reports with graphical representation of the proxy server's traffic, somewhat like the popular MRTG tool." I found by chance that the corresponding translation strings were still present, but not used, so I thought "Why not?". After some tests I decided to revive this tool - here it is as an IPFire addon, based on the original sources. About four weeks ago, I sent an email to the original developer via Sourceforge, asking if he would mind if I would patch his sources for use with IPFire, but still got no answer, so I decided to publish this IPFire'd version. I'm using the original tarball - if anything is updated, patching is easy. Main differences to the original version: GUI and scripts were slightly tuned, fully localised and polished for better readability. The old translation strings were removed, all needed localisations went in '/var/ipfire/addon-lang/'. For better GUI integration I moved the menu-entry 'entropy' one step down, so that the '*-graphs' entries were lying together. I found no problems so far during testing. Updates are made every five minutes through '/etc/fcron.cyclic'. Feedback is welcome... Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/menu/20-status.menu | 2 +- config/rootfiles/packages/squid-graph | 17 ++ langs/de/cgi-bin/de.pl | 3 - langs/en/cgi-bin/en.pl | 3 - langs/es/cgi-bin/es.pl | 3 - langs/fr/cgi-bin/fr.pl | 3 - langs/it/cgi-bin/it.pl | 3 - langs/nl/cgi-bin/nl.pl | 3 - langs/pl/cgi-bin/pl.pl | 3 - langs/ru/cgi-bin/ru.pl | 3 - langs/tr/cgi-bin/tr.pl | 3 - lfs/squid-graph | 112 ++++++++++ make.sh | 1 + src/paks/squid-graph/install.sh | 31 +++ src/paks/squid-graph/uninstall.sh | 28 +++ src/paks/squid-graph/update.sh | 26 +++ .../squid-graph/squid-graph-for-ipfire.patch | 238 +++++++++++++++++++++ src/squid-graph/EX-squid-graph.menu | 6 + src/squid-graph/logo.png | Bin 0 -> 3933 bytes src/squid-graph/sgraph.cgi | 72 +++++++ src/squid-graph/squid-graph.de.pl | 49 +++++ src/squid-graph/squid-graph.en.pl | 49 +++++ src/squid-graph/squid-graph.es.pl | 10 + src/squid-graph/squid-graph.fr.pl | 9 + src/squid-graph/squid-graph.it.pl | 9 + src/squid-graph/squid-graph.nl.pl | 9 + src/squid-graph/squid-graph.pl.pl | 9 + src/squid-graph/squid-graph.ru.pl | 9 + src/squid-graph/squid-graph.tr.pl | 9 + src/squid-graph/update-squid-graph.sh | 8 + 30 files changed, 702 insertions(+), 28 deletions(-) create mode 100644 config/rootfiles/packages/squid-graph create mode 100644 lfs/squid-graph create mode 100644 src/paks/squid-graph/install.sh create mode 100644 src/paks/squid-graph/uninstall.sh create mode 100644 src/paks/squid-graph/update.sh create mode 100644 src/patches/squid-graph/squid-graph-for-ipfire.patch create mode 100644 src/squid-graph/EX-squid-graph.menu create mode 100644 src/squid-graph/logo.png create mode 100644 src/squid-graph/sgraph.cgi create mode 100644 src/squid-graph/squid-graph.de.pl create mode 100644 src/squid-graph/squid-graph.en.pl create mode 100644 src/squid-graph/squid-graph.es.pl create mode 100644 src/squid-graph/squid-graph.fr.pl create mode 100644 src/squid-graph/squid-graph.it.pl create mode 100644 src/squid-graph/squid-graph.nl.pl create mode 100644 src/squid-graph/squid-graph.pl.pl create mode 100644 src/squid-graph/squid-graph.ru.pl create mode 100644 src/squid-graph/squid-graph.tr.pl create mode 100644 src/squid-graph/update-squid-graph.sh diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 2bcf0d5e8..2e7c579e3 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -58,7 +58,7 @@ 'title' => "$Lang::tr{'hardware graphs'}", 'enabled' => 1, }; - $substatus->{'61.entropy'} = { + $substatus->{'62.entropy'} = { 'caption' => "$Lang::tr{'entropy'}", 'uri' => '/cgi-bin/entropy.cgi', 'title' => "$Lang::tr{'entropy graphs'}", diff --git a/config/rootfiles/packages/squid-graph b/config/rootfiles/packages/squid-graph new file mode 100644 index 000000000..2319c4f34 --- /dev/null +++ b/config/rootfiles/packages/squid-graph @@ -0,0 +1,17 @@ +etc/fcron.cyclic/update-squid-graph +srv/web/ipfire/cgi-bin/sgraph.cgi +srv/web/ipfire/html/sgraph +srv/web/ipfire/html/sgraph/logo.png +usr/bin/squid-graph +usr/local/bin/update-squid-graph.sh +var/ipfire/addon-lang/squid-graph.de.pl +var/ipfire/addon-lang/squid-graph.en.pl +var/ipfire/addon-lang/squid-graph.es.pl +var/ipfire/addon-lang/squid-graph.fr.pl +var/ipfire/addon-lang/squid-graph.it.pl +var/ipfire/addon-lang/squid-graph.nl.pl +var/ipfire/addon-lang/squid-graph.pl.pl +var/ipfire/addon-lang/squid-graph.ru.pl +var/ipfire/addon-lang/squid-graph.tr.pl +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/EX-squid-graph.menu diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6dff5d781..12da3e2ab 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1692,7 +1692,6 @@ 'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.', 'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.', 'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.', -'no information available' => 'Keine Informationen verfügbar.', 'no log selected' => 'kein Protokoll ausgewählt', 'no modem selected' => 'Kein Modem ausgewählt', 'no set selected' => 'Es wurde kein Satz ausgewählt', @@ -1934,7 +1933,6 @@ 'proto' => 'Proto', 'protocol' => 'Protokoll:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Diagramme zur Proxyauslastung', 'proxy admin password' => 'Cache Administrator Passwort', 'proxy cachemgr' => 'Cachemanager aktivieren', 'proxy errmsg filedescriptors' => 'Ungültiger Anzahl Filedescriptoren', @@ -2157,7 +2155,6 @@ 'ssnetwork status' => 'Netzwerk-Status', 'sspasswords' => 'Passwörter', 'ssport forwarding' => 'Port-Weiterleitung', -'ssproxy graphs' => 'Proxy-Diagramme', 'sssystem status' => 'System-Status', 'sstraffic' => 'Net-Traffic', 'sstraffic graphs' => 'Netzwerk-Diagramme', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 4efff6e65..98694a7ab 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1724,7 +1724,6 @@ 'no filter pass' => 'Enter the standard class for non-filtered packets.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', 'no hardware random number generator' => 'This system has no source for entropy.', -'no information available' => 'No information available.', 'no log selected' => 'No log selected', 'no modem selected' => 'No modem selected', 'no set selected' => 'No set was selected', @@ -1970,7 +1969,6 @@ 'proto' => 'Proto', 'protocol' => 'Protocol:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Proxy access graphs', 'proxy admin password' => 'Cache administrator password', 'proxy cachemgr' => 'Activate cachemanager', 'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors', @@ -2199,7 +2197,6 @@ 'ssnetwork status' => 'Network Status', 'sspasswords' => 'Passwords', 'ssport forwarding' => 'Port Forwarding', -'ssproxy graphs' => 'Proxy Graphs', 'sssystem status' => 'System Status', 'sstraffic' => 'Net-Traffic', 'sstraffic graphs' => 'Traffic Graphs', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ede7b661d..b1fb65e9c 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1256,7 +1256,6 @@ 'no eciadsl synch.bin file' => 'No existe archi ECI ADSL synch.bin. Favor de cargarlo', 'no filter pass' => 'Introduzca la clase estándar para paquetes no filtrados.', 'no fritzdsl driver' => 'No hay drivers Fritz!DSL. Favor de cargarlos', -'no information available' => 'No hay información disponible', 'no log selected' => 'No ha seleccionado registro log', 'no modem selected' => 'No ha seleccionado módem', 'no set selected' => 'Ningún conjunto se ha seleccionado', @@ -1437,7 +1436,6 @@ 'proto' => 'Proto', 'protocol' => 'Protocolo:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Gráficas de acceso al proxy', 'proxy admin password' => 'Password Administrador de Caché', 'proxy cachemgr' => 'Activar Cachemanager', 'proxy errmsg filedescriptors' => 'Cantidad incorrecta de descriptores de archivos', @@ -1647,7 +1645,6 @@ 'ssnetwork status' => 'Estado de la red', 'sspasswords' => 'Contraseñas', 'ssport forwarding' => 'Reenvío de puertos', -'ssproxy graphs' => 'Gráficas de proxy', 'sssystem status' => 'Status del sistema', 'sstraffic' => 'Net-traffic', 'sstraffic graphs' => 'Gráficas de tráfico', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index e896c9b2a..8041db982 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1247,7 +1247,6 @@ 'no eciadsl synch.bin file' => 'aucunfichier ECI ADSL synch.bin. Veuillez le charger.', 'no filter pass' => 'Entrez la classe standard pour les paquets non filtrés.', 'no fritzdsl driver' => 'Aucun pilote Fritz!DSL. Veuillez le charger.', -'no information available' => 'Aucune information disponible.', 'no log selected' => 'Aucun rapport sélectionné', 'no modem selected' => 'Aucun modem sélectionné', 'no set selected' => 'Aucun jeu sélectionné', @@ -1443,7 +1442,6 @@ 'proto' => 'Proto', 'protocol' => 'Protocole', 'proxy' => 'Proxy', -'proxy access graphs' => 'Graphiques des accès proxy', 'proxy admin password' => 'Mot de passe admnistrateur du Cache', 'proxy cachemgr' => 'Activer le gestionnaire de cache', 'proxy errmsg filedescriptors' => 'Mauvais montant de fichier descripteurs', @@ -1652,7 +1650,6 @@ 'ssnetwork status' => 'Statut réseau', 'sspasswords' => 'Mots de passe', 'ssport forwarding' => 'Transfert de port', -'ssproxy graphs' => 'Graphiques du proxy', 'sssystem status' => 'Statut système', 'sstraffic' => 'Trafic réseau', 'sstraffic graphs' => 'Graphiques du trafic', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 02e047bb3..fc80a526d 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1592,7 +1592,6 @@ 'no filter pass' => 'Enter the standard class for non-filtered packets.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', 'no hardware random number generator' => 'This system has no source for entropy.', -'no information available' => 'No information available.', 'no log selected' => 'No log selected', 'no modem selected' => 'No modem selected', 'no set selected' => 'No set was selected', @@ -1827,7 +1826,6 @@ 'proto' => 'Proto', 'protocol' => 'Protocolo', 'proxy' => 'Proxy', -'proxy access graphs' => 'Proxy access graphs', 'proxy admin password' => 'Cache administrator password', 'proxy cachemgr' => 'Attiva cachemanager', 'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors', @@ -2052,7 +2050,6 @@ 'ssnetwork status' => 'Network Status', 'sspasswords' => 'Passwords', 'ssport forwarding' => 'Port Forwarding', -'ssproxy graphs' => 'Proxy Graphs', 'sssystem status' => 'Stato del sistema', 'sstraffic' => 'Traffico di rete', 'sstraffic graphs' => 'Traffic Graphs', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 49c0cced6..97553962c 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1555,7 +1555,6 @@ 'no filter pass' => 'Geef de standaard-klasse voor niet-gefilterde pakketten.', 'no fritzdsl driver' => 'Geen Fritz!DSL driver. Bestand uploaden a.u.b.', 'no hardware random number generator' => 'Dit systeem heeft geen mogelijkheden voor entropie.', -'no information available' => 'Geen informatie beschikbaar.', 'no log selected' => 'Geen log geselecteerd', 'no modem selected' => 'Geen modem geselecteerd', 'no set selected' => 'Geen set geselecteerd', @@ -1780,7 +1779,6 @@ 'proto' => 'Proto', 'protocol' => 'Protocol:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Proxy toegangsgrafieken', 'proxy admin password' => 'Cache beheerder wachtwoord', 'proxy cachemgr' => 'Activeer cachebeheer', 'proxy errmsg filedescriptors' => 'Verkeerd aantal bestandsindicators', @@ -2000,7 +1998,6 @@ 'ssnetwork status' => 'Netwerkstatus', 'sspasswords' => 'Wachtwoorden', 'ssport forwarding' => 'Poort doorsturen', -'ssproxy graphs' => 'Proxy grafieken', 'sssystem status' => 'Systeemstatus', 'sstraffic' => 'Netwerkgebruik', 'sstraffic graphs' => 'Verkeersgrafieken', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index e2f9da5c0..4788a8599 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1255,7 +1255,6 @@ 'no eciadsl synch.bin file' => 'Brak pliku ECI ADSL synch.bin. Proszę o jego wgranie.', 'no filter pass' => 'Proszę wprowadzić standardową klasę dla pakietów niefiltrowanych.', 'no fritzdsl driver' => 'Brak sterownika Fritz!DSL. Proszę o jego wgranie.', -'no information available' => 'Brak dostępnych informacji.', 'no log selected' => 'Nie wybrano logu', 'no modem selected' => 'Nie wybrano modemu', 'no set selected' => 'Nie wybrano ustawienia', @@ -1449,7 +1448,6 @@ 'proto' => 'Proto', 'protocol' => 'Protokół:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Wykresy dostępu do Proxy', 'proxy admin password' => 'Hasło administratora Cache', 'proxy cachemgr' => 'Aktywuj cachemanager', 'proxy errmsg filedescriptors' => 'Niepoprawna wartość w polu filedescriptors', @@ -1659,7 +1657,6 @@ 'ssnetwork status' => 'Stan sieci', 'sspasswords' => 'Hasła', 'ssport forwarding' => 'Przekierowanie portów', -'ssproxy graphs' => 'Wykresy Proxy', 'sssystem status' => 'Stan systemu', 'sstraffic' => 'Net-Traffic', 'sstraffic graphs' => 'Wykresy ruchu', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 4b0edb582..eefa3bc49 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1247,7 +1247,6 @@ 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.', 'no filter pass' => 'Задайте стандартный класс для нефильтруемых пакетов.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', -'no information available' => 'No information available.', 'no log selected' => 'No log selected', 'no modem selected' => 'No modem selected', 'no set selected' => 'No set was selected', @@ -1444,7 +1443,6 @@ 'proto' => 'Proto', 'protocol' => 'Протокол:', 'proxy' => 'Proxy', -'proxy access graphs' => 'Proxy access graphs', 'proxy admin password' => 'Cache administrator password', 'proxy cachemgr' => 'Включить менеджер кэша', 'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors', @@ -1654,7 +1652,6 @@ 'ssnetwork status' => 'Статус сети', 'sspasswords' => 'Пароли', 'ssport forwarding' => 'Перенаправление портов', -'ssproxy graphs' => 'Proxy Graphs', 'sssystem status' => 'Статус системы', 'sstraffic' => 'Сетевой трафик', 'sstraffic graphs' => 'Traffic Graphs', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9eb300006..42e615799 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1660,7 +1660,6 @@ 'no filter pass' => 'Olmayan filtre paketleri için standart sınıfı girin.', 'no fritzdsl driver' => 'Fritz!DSL sürücüsü yok. Lütfen yükleyin.', 'no hardware random number generator' => 'Bu sistemin entropi için kaynağı yok.', -'no information available' => 'Herhangi bir bilgi bulunmamaktadır.', 'no log selected' => 'Günlük seçilmedi', 'no modem selected' => 'Modem seçilmedi', 'no set selected' => 'Hiçbir ayar seçilmedi', @@ -1902,7 +1901,6 @@ 'proto' => 'Kural', 'protocol' => 'Kural ', 'proxy' => 'Vekil sunucu', -'proxy access graphs' => 'Vekil sunucu erişim grafiği', 'proxy admin password' => 'Önbellek yönetici parolası', 'proxy cachemgr' => 'Önbellek yöneticisini aktifleştir', 'proxy errmsg filedescriptors' => 'Dosya tanimlayıcı sayısı yanlış miktarda', @@ -2131,7 +2129,6 @@ 'ssnetwork status' => 'Ağ Durumu', 'sspasswords' => 'Parola', 'ssport forwarding' => 'Bağlantı Noktası Yönlendirme', -'ssproxy graphs' => 'Vekil Sunucu Grafikleri', 'sssystem status' => 'Sistem Durumu', 'sstraffic' => 'Ağ-Trafiği', 'sstraffic graphs' => 'Trafik Grafiği', diff --git a/lfs/squid-graph b/lfs/squid-graph new file mode 100644 index 000000000..c93eae608 --- /dev/null +++ b/lfs/squid-graph @@ -0,0 +1,112 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.2 + +THISAPP = squid-graph-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/squid-graph +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = squid-graph +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7ed7d187f87bde1ec9dabe05f07053b5 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid-graph/squid-graph-for-ipfire.patch + +# Install GUI + install -v -m 755 ../src/squid-graph/sgraph.cgi \ + /srv/web/ipfire/cgi-bin/sgraph.cgi + +# Create sgraph dir, install logo.png + -mkdir -p /srv/web/ipfire/html/sgraph + install -v -m 644 ../src/squid-graph/logo.png \ + /srv/web/ipfire/html/sgraph/logo.png + +# Install main program + install -v -m 755 $(DIR_APP)/squid-graph \ + /usr/bin/squid-graph + +# Install update script + install -v -m 755 ../src/squid-graph/update-squid-graph.sh \ + /usr/local/bin/update-squid-graph.sh + +# Create symlink for five-minute-update-interval + ln -sf /usr/local/bin/update-squid-graph.sh /etc/fcron.cyclic/update-squid-graph + +# Install language files + install -v -m 004 ../src/squid-graph/squid-graph.*.pl \ + /var/ipfire/addon-lang/ + +# Install menu entry + install -v -m 644 ../src/squid-graph/EX-squid-graph.menu \ + /var/ipfire/menu.d/EX-squid-graph.menu + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f8a2e5b34..efcee24b3 100755 --- a/make.sh +++ b/make.sh @@ -877,6 +877,7 @@ buildipfire() { lfsmake2 perl-Net-IP lfsmake2 wio lfsmake2 iftop + lfsmake2 squid-graph } buildinstaller() { diff --git a/src/paks/squid-graph/install.sh b/src/paks/squid-graph/install.sh new file mode 100644 index 000000000..1e3b60c6e --- /dev/null +++ b/src/paks/squid-graph/install.sh @@ -0,0 +1,31 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files + +# Update language-cache +/usr/local/bin/update-lang-cache + +chown nobody.nobody /var/ipfire/menu.d/EX-squid-graph.menu diff --git a/src/paks/squid-graph/uninstall.sh b/src/paks/squid-graph/uninstall.sh new file mode 100644 index 000000000..dac570c05 --- /dev/null +++ b/src/paks/squid-graph/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +remove_files + +/usr/local/bin/update-lang-cache diff --git a/src/paks/squid-graph/update.sh b/src/paks/squid-graph/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/squid-graph/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/squid-graph/squid-graph-for-ipfire.patch b/src/patches/squid-graph/squid-graph-for-ipfire.patch new file mode 100644 index 000000000..a583b3dc7 --- /dev/null +++ b/src/patches/squid-graph/squid-graph-for-ipfire.patch @@ -0,0 +1,238 @@ +--- a/squid-graph Mon Oct 02 20:46:43 2006 ++++ b/squid-graph Tue Nov 14 12:53:03 2017 +@@ -13,11 +13,14 @@ + use strict; + use GD; + ++require '/var/ipfire/general-functions.pl'; ++require "${General::swroot}/lang.pl"; ++ + # Program version (DO NOT TOUCH THIS) + my $VER = "3.2 release"; + + # Enable console logging? (1 = on, 0 = off) +-my $CONSOLELOG = 1; ++my $CONSOLELOG = 0; + + # "Global" variables (DO NOT TOUCH THESE) + my %config; # configuration details here +@@ -26,10 +29,10 @@ + # Define graph colours [RRR,GGG,BBB] + $color{'bg'} = ['F5','F5','F5']; # graph background color + $color{'fg'} = ['00','00','00']; # graph foreground color +-$color{'gr'} = ['00','00','FF']; # graph total line color +-$color{'hit'} = ['FF','00','00']; # graph hit line color +-$color{'miss'} = ['00','FF','00']; # graph miss line color +-$color{'ims'} = ['FF','00','FF']; # graph ims hit line color ++$color{'gr'} = ['33','33','99']; # graph total line color ++$color{'hit'} = ['99','33','33']; # graph hit line color ++$color{'miss'} = ['33','99','33']; # graph miss line color ++$color{'ims'} = ['99','33','99']; # graph ims hit line color + $color{'hbg'} = ['FF','FF','FF']; # html report background color + + ############ DO NOT EDIT ANYTHING BELOW THIS LINE ############## +@@ -319,7 +322,7 @@ + $progSpeed = dec_truncate($lineCounter/$duration,2); + + # Do some console logging +- console_log("Done reading $lineCounter lines from logfile on STDIN. ($errorLines errors)"); ++ console_log("Done reading $lineCounter lines from logfile on STDIN. ($errorLines $Lang::tr{'errors'})"); + console_log("Analysis duration is $duration seconds, $progSpeed lines/sec."); + + # Create image objects +@@ -612,13 +615,13 @@ + print IDX "<BR>\n"; + + print IDX "<TABLE BORDER=0>\n"; +- print IDX "<TR><TD><B>Generated:</B></TD><TD>$progStartTime</TD></TR>\n"; +- print IDX "<TR><TD><B>Lines Analyzed:</B></TD><TD>$lineCounter lines ($errorLines errors)</TD></TR>\n"; +- print IDX "<TR><TD><B>Analysis Duration:</B></TD><TD>$duration seconds</TD></TR>\n"; +- print IDX "<TR><TD><B>Analysis Speed:</B></TD><TD>$progSpeed lines/sec</TD></TR>\n"; +- print IDX "<TR><TD><B>Graph Start:</B></TD><TD>$logStartTime</TD></TR>\n"; +- print IDX "<TR><TD><B>Graph End:</B></TD><TD>$logEndTime</TD></TR>\n"; +- print IDX "<TR><TD><B>Graph Domain:</B></TD><TD>24 hours (86400 seconds)</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'generated'}:</B></TD><TD style=padding-left:5px>$progStartTime</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'lines analyzed'}:</B></TD><TD style=padding-left:5px>$lineCounter $Lang::tr{'lines'} ($errorLines $Lang::tr{'errors'})</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'analysis duration'}:</B></TD><TD style=padding-left:5px>$duration $Lang::tr{'seconds'}</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'analysis speed'}:</B></TD><TD style=padding-left:5px>$progSpeed $Lang::tr{'lines sec'}</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'graph start'}:</B></TD><TD style=padding-left:5px>$logStartTime</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'graph end'}:</B></TD><TD style=padding-left:5px>$logEndTime</TD></TR>\n"; ++ print IDX "<TR><TD><B>$Lang::tr{'graph domain'}:</B></TD><TD style=padding-left:5px>24 $Lang::tr{'hours'} ($Lang::tr{'24hseconds'})</TD></TR>\n"; + print IDX "</TABLE>\n"; + + sub generate_html_row($$$) { +@@ -629,7 +632,7 @@ + + $ret = "<TR>"; + $ret .= "<TD ALIGN=RIGHT><FONT SIZE=-1 COLOR=#$color><B>$key:</B></FONT></TD>"; +- $ret .= "<TD ALIGN=LEFT><FONT SIZE=-1>$value</FONT></TD>"; ++ $ret .= "<TD style=padding-left:5px ALIGN=LEFT><FONT SIZE=-1>$value</FONT></TD>"; + $ret .= "</TR>\n"; + + undef $color; +@@ -641,58 +644,58 @@ + + if ($have_tcp) { + print IDX "<BR><HR><BR>\n"; +- print IDX "<H3>Graph of TCP Accesses (5 minute total)</H3>\n" if (!$have_cumulative); +- print IDX "<H3>Cumulative graph of TCP Accesses</H3>\n" if ($have_cumulative); ++ print IDX "<H3>$Lang::tr{'graph of tcp accesses'}</H3>\n" if (!$have_cumulative); ++ print IDX "<H3>$Lang::tr{'cumulative graph of tcp accesses'}</H3>\n" if ($have_cumulative); + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=tcp-access.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Total Accesses",$tcpAccessTotals); +- print IDX generate_html_row($grcolor,"Average Accesses","$tcpAccessAverage per hour"); +- print IDX generate_html_row($hitcolor,"Total Cache Hits",$tcpAccessHitTotals); +- print IDX generate_html_row($hitcolor,"Average Cache Hits","$tcpAccessHitAverage per hour"); +- print IDX generate_html_row($hitcolor,"% Cache Hits","$tcpAccessHitPercentage %"); +- print IDX generate_html_row($imscolor,"Total Cache IMS Hits",$tcpAccessIMSTotals); +- print IDX generate_html_row($imscolor,"Average Cache IMS Hits","$tcpAccessIMSAverage per hour"); +- print IDX generate_html_row($misscolor,"Total Cache Misses",$tcpAccessMissTotals); +- print IDX generate_html_row($misscolor,"Average Cache Misses","$tcpAccessMissAverage per hour"); +- print IDX generate_html_row($misscolor,"% Cache Misses","$tcpAccessMissPercentage %"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'total accesses'}",$tcpAccessTotals); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'average accesses'}","$tcpAccessAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$tcpAccessHitTotals); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$tcpAccessHitAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$tcpAccessHitPercentage %"); ++ print IDX generate_html_row($imscolor,"$Lang::tr{'total cache ims hits'}",$tcpAccessIMSTotals); ++ print IDX generate_html_row($imscolor,"$Lang::tr{'average cache ims hits'}","$tcpAccessIMSAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$tcpAccessMissTotals); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$tcpAccessMissAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$tcpAccessMissPercentage %"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; + print IDX "</TABLE>\n"; +- print IDX "<H3>Graph of TCP Transfers (5 minute total)</H3>\n" if (!$have_cumulative); +- print IDX "<H3>Cumulative graph of TCP Transfers</H3>\n" if ($have_cumulative); ++ print IDX "<H3>$Lang::tr{'graph of tcp transfers'}</H3>\n" if (!$have_cumulative); ++ print IDX "<H3>$Lang::tr{'cumulative graph of tcp transfers'}</H3>\n" if ($have_cumulative); + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=tcp-transfer.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Total Transfers",$tcpTransferTotals); +- print IDX generate_html_row($grcolor,"Average Transfers","$tcpTransferAverage per hour"); +- print IDX generate_html_row($hitcolor,"Total Cache Hits",$tcpTransferHitTotals); +- print IDX generate_html_row($hitcolor,"Average Cache Hits","$tcpTransferHitAverage per hour"); +- print IDX generate_html_row($hitcolor,"% Cache Hits","$tcpTransferHitPercentage %"); +- print IDX generate_html_row($imscolor,"Total Cache IMS Hits",$tcpTransferIMSTotals); +- print IDX generate_html_row($imscolor,"Average Cache IMS Hits","$tcpTransferIMSAverage per hour"); +- print IDX generate_html_row($misscolor,"Total Cache Misses",$tcpTransferMissTotals); +- print IDX generate_html_row($misscolor,"Average Cache Misses","$tcpTransferMissAverage per hour"); +- print IDX generate_html_row($misscolor,"% Cache Misses","$tcpTransferMissPercentage %"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'total transfers'}",$tcpTransferTotals); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'average transfers'}","$tcpTransferAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$tcpTransferHitTotals); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$tcpTransferHitAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$tcpTransferHitPercentage %"); ++ print IDX generate_html_row($imscolor,"$Lang::tr{'total cache ims hits'}",$tcpTransferIMSTotals); ++ print IDX generate_html_row($imscolor,"$Lang::tr{'average cache ims hits'}","$tcpTransferIMSAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$tcpTransferMissTotals); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$tcpTransferMissAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$tcpTransferMissPercentage %"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; + print IDX "</TABLE>\n"; + if ($have_transfer) { +- print IDX "<H3>Graph of Average TCP Transfer Duration</H3>\n"; ++ print IDX "<H3>$Lang::tr{'graph of average tcp transfer duration'}</H3>\n"; + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=tcp-duration.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Avg. Transfer Duration","$tcpTimeAverage seconds"); +- print IDX generate_html_row($hitcolor,"Avg. Cache Hit Duration","$tcpTimeHitAverage seconds"); +- print IDX generate_html_row($misscolor,"Avg. Cache Miss Duration","$tcpTimeMissAverage seconds"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'avg transfer duration'}","$tcpTimeAverage $Lang::tr{'seconds'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'avg cache hit duration'}","$tcpTimeHitAverage $Lang::tr{'seconds'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'avg cache miss duration'}","$tcpTimeMissAverage $Lang::tr{'seconds'}"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; +@@ -702,54 +705,54 @@ + + if ($have_udp) { + print IDX "<BR><HR><BR>\n"; +- print IDX "<H3>Graph of UDP Accesses (5 minute total)</H3>\n" if (!$have_cumulative); +- print IDX "<H3>Cumulative graph of UDP Accesses</H3>\n" if ($have_cumulative); ++ print IDX "<H3>$Lang::tr{'graph of udp accesses'}</H3>\n" if (!$have_cumulative); ++ print IDX "<H3>$Lang::tr{'cumulative graph of udp accesses'}</H3>\n" if ($have_cumulative); + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=udp-access.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Total Accesses",$udpAccessTotals); +- print IDX generate_html_row($grcolor,"Average Accesses","$udpAccessAverage per hour"); +- print IDX generate_html_row($hitcolor,"Total Cache Hits",$udpAccessHitTotals); +- print IDX generate_html_row($hitcolor,"Average Cache Hits","$udpAccessHitAverage per hour"); +- print IDX generate_html_row($hitcolor,"% Cache Hits","$udpAccessHitPercentage %"); +- print IDX generate_html_row($misscolor,"Total Cache Misses",$udpAccessMissTotals); +- print IDX generate_html_row($misscolor,"Average Cache Misses","$udpAccessMissAverage per hour"); +- print IDX generate_html_row($misscolor,"% Cache Misses","$udpAccessMissPercentage %"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'total accesses'}",$udpAccessTotals); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'average accesses'}","$udpAccessAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$udpAccessHitTotals); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$udpAccessHitAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$udpAccessHitPercentage %"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$udpAccessMissTotals); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$udpAccessMissAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$udpAccessMissPercentage %"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; + print IDX "</TABLE>\n"; +- print IDX "<H3>Graph of UDP Transfers (5 minute total)</H3>\n" if (!$have_cumulative); +- print IDX "<H3>Cumulative graph of UDP Transfers</H3>\n" if ($have_cumulative); ++ print IDX "<H3>$Lang::tr{'graph of udp transfers'}</H3>\n" if (!$have_cumulative); ++ print IDX "<H3>$Lang::tr{'cumulative graph of udp transfers'}</H3>\n" if ($have_cumulative); + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=udp-transfer.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Total Transfers",$udpTransferTotals); +- print IDX generate_html_row($grcolor,"Average Transfers","$udpTransferAverage per hour"); +- print IDX generate_html_row($hitcolor,"Total Cache Hits",$udpTransferHitTotals); +- print IDX generate_html_row($hitcolor,"Average Cache Hits","$udpTransferHitAverage per hour"); +- print IDX generate_html_row($hitcolor,"% Cache Hits","$udpTransferHitPercentage %"); +- print IDX generate_html_row($misscolor,"Total Cache Misses",$udpTransferMissTotals); +- print IDX generate_html_row($misscolor,"Average Cache Misses","$udpTransferMissAverage per hour"); +- print IDX generate_html_row($misscolor,"% Cache Misses","$udpTransferMissPercentage %"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'total transfers'}",$udpTransferTotals); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'average transfers'}","$udpTransferAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$udpTransferHitTotals); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$udpTransferHitAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$udpTransferHitPercentage %"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$udpTransferMissTotals); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$udpTransferMissAverage $Lang::tr{'per hour'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$udpTransferMissPercentage %"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; + print IDX "</TABLE>\n"; + if ($have_transfer) { +- print IDX "<H3>Graph of Average UDP Transfer Duration</H3>\n"; ++ print IDX "<H3>$Lang::tr{'graph of average udp transfer duration'}</H3>\n"; + print IDX "<TABLE BORDER=0>\n"; + print IDX "<TR>\n"; + print IDX "<TD><IMG SRC=udp-duration.png></TD>\n"; + print IDX "<TD>\n"; + print IDX "<TABLE BORDER=0>\n"; +- print IDX generate_html_row($grcolor,"Avg. Transfer Duration","$udpTimeAverage seconds"); +- print IDX generate_html_row($hitcolor,"Avg. Cache Hit Duration","$udpTimeHitAverage seconds"); +- print IDX generate_html_row($misscolor,"Avg. Cache Miss Duration","$udpTimeMissAverage seconds"); ++ print IDX generate_html_row($grcolor,"$Lang::tr{'avg transfer duration'}","$udpTimeAverage $Lang::tr{'seconds'}"); ++ print IDX generate_html_row($hitcolor,"$Lang::tr{'avg cache hit duration'}","$udpTimeHitAverage $Lang::tr{'seconds'}"); ++ print IDX generate_html_row($misscolor,"$Lang::tr{'avg cache miss duration'}","$udpTimeMissAverage $Lang::tr{'seconds'}"); + print IDX "</TABLE>\n"; + print IDX "</TD>\n"; + print IDX "</TR>\n"; diff --git a/src/squid-graph/EX-squid-graph.menu b/src/squid-graph/EX-squid-graph.menu new file mode 100644 index 000000000..a46bf6a79 --- /dev/null +++ b/src/squid-graph/EX-squid-graph.menu @@ -0,0 +1,6 @@ + $substatus->{'61.squid-graph'} = { + 'caption' => "$Lang::tr{'ssproxy graphs'}", + 'uri' => '/cgi-bin/sgraph.cgi', + 'title' => "$Lang::tr{'ssproxy graphs'}", + 'enabled' => 1, + }; diff --git a/src/squid-graph/logo.png b/src/squid-graph/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e2fe57b703e2662ec3fd9b70b6cfb6de4425aadf GIT binary patch literal 3933 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 literal 0 HcmV?d00001 diff --git a/src/squid-graph/sgraph.cgi b/src/squid-graph/sgraph.cgi new file mode 100644 index 000000000..ed25cd118 --- /dev/null +++ b/src/squid-graph/sgraph.cgi @@ -0,0 +1,72 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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/>. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +my @graphs = (); + +&Header::showhttpheaders(); + +my $dir = "/srv/web/ipfire/html/sgraph"; +my $sgraphdir = "/srv/web/ipfire/html/sgraph"; + +&Header::openpage($Lang::tr{'ssproxy graphs'}, 1, ''); + +&Header::openbigbox('100%', 'left'); + +&Header::openbox('100%', 'left', $Lang::tr{'proxy access graphs'} . ":" ); + +if (open(IPACHTML, "$sgraphdir/index.html")) +{ + my $skip = 1; + while (<IPACHTML>) + { + $skip = 1 if /^<HR>$/; + if ($skip) + { + $skip = 0 if /<H1>/; + next; + } + s/<IMG SRC=([^"'>]+)>/<img src='\/sgraph\/$1' alt='Graph' \/>/; + s/<HR>/<hr \/>/g; + s/<BR>/<br \/>/g; + s/<([^>]*)>/\L<$1>\E/g; + s/(size|align|border|color)=([^'"> ]+)/$1='$2'/g; + print; + } + close(IPACHTML); +} +else { + print $Lang::tr{'no information available'}; } + +&Header::closebox(); + +&Header::closebigbox(); + +&Header::closepage(); diff --git a/src/squid-graph/squid-graph.de.pl b/src/squid-graph/squid-graph.de.pl new file mode 100644 index 000000000..54d1d414d --- /dev/null +++ b/src/squid-graph/squid-graph.de.pl @@ -0,0 +1,49 @@ +%tr = ( +%tr, + +'24hseconds' => '86400 Sekunden', +'analysis duration' => 'Analyse - Dauer', +'analysis speed' => 'Analyse - Geschwindigkeit', +'average accesses' => 'Zugriffe - Durchschnitt', +'average cache hits' => 'Cache-Treffer - Durchschnitt', +'average cache ims hits' => 'Cache-IMS-Treffer - Durchschnitt', +'average cache misses' => 'Cache verfehlt - Durchschnitt', +'average transfers' => 'Transfers - Durchschnitt', +'avg cache hit duration' => 'Cache-Dauer (Treffer)', +'avg cache miss duration' => 'Cache-Dauer (verfehlt)', +'avg transfer duration' => 'Transfer-Dauer', +'cumulative graph of tcp accesses' => 'TCP-Zugriffe (Zusammenfassung)', +'cumulative graph of tcp transfers' => 'TCP-Transfers (Zusammenfassung)', +'cumulative graph of udp accesses' => 'UDP-Zugriffe (Zusammenfassung)', +'cumulative graph of udp transfers' => 'UDP-Transfers (Zusammenfassung)', +'errors' => 'Fehler', +'generated' => 'Erstellt', +'graph domain' => 'Diagramm - Zeitraum', +'graph end' => 'Diagramm - Ende', +'graph of average tcp transfer duration' => 'TCP-Transfer-Dauer (Durchschnitt)', +'graph of average udp transfer duration' => 'UDP-Transfer-Dauer (Durchschnitt)', +'graph of tcp accesses' => 'TCP-Zugriffe (alle 5 Minuten)', +'graph of tcp transfers' => 'TCP-Transfers (alle 5 Minuten)', +'graph of udp accesses' => 'UDP-Zugriffe (alle 5 Minuten)', +'graph of udp transfers' => 'UDP-Transfers (alle 5 Minuten)', +'graph start' => 'Diagramm - Start', +'hours' => 'Stunden', +'lines analyzed' => 'Analysierte Zeilen<br />(access.log)', +'lines sec' => 'Zeilen/Sekunde', +'lines' => 'Zeilen', +'no information available' => 'Keine Informationen verfügbar.', +'percent cache hits' => 'Cache-Treffer - Prozent', +'percent cache misses' => 'Cache verfehlt - Prozent', +'per hour' => 'pro Stunde', +'proxy access graphs' => 'Diagramme zur Proxyauslastung', +'seconds' => 'Sekunde(n)', +'ssproxy graphs' => 'Proxy-Diagramme', +'total accesses' => 'Zugriffe - gesamt', +'total cache hits' => 'Cache-Treffer - gesamt', +'total cache ims hits' => 'Cache-IMS-Treffer - gesamt', +'total cache misses' => 'Cache verfehlt - gesamt', +'total transfers' => 'Transfers - gesamt', + +); + +#EOF diff --git a/src/squid-graph/squid-graph.en.pl b/src/squid-graph/squid-graph.en.pl new file mode 100644 index 000000000..385729352 --- /dev/null +++ b/src/squid-graph/squid-graph.en.pl @@ -0,0 +1,49 @@ +%tr = ( +%tr, + +'24hseconds' => '86400 seconds', +'analysis duration' => 'Analysis Duration', +'analysis speed' => 'Analysis Speed', +'average accesses' => 'Average Accesses', +'average cache hits' => 'Average Cache Hits', +'average cache ims hits' => 'Average Cache IMS Hits', +'average cache misses' => 'Average Cache Misses', +'average transfers' => 'Average Transfers', +'avg cache hit duration' => 'Avg. Cache Hit Duration', +'avg cache miss duration' => 'Avg. Cache Miss Duration', +'avg transfer duration' => 'Avg. Transfer Duration', +'cumulative graph of tcp accesses' => 'TCP Accesses - cumulative', +'cumulative graph of tcp transfers' => 'TCP Transfers - cumulative', +'cumulative graph of udp accesses' => 'UDP Accesses - cumulative', +'cumulative graph of udp transfers' => 'UDP Transfers - cumulative', +'errors' => 'error(s)', +'generated' => 'Generated', +'graph domain' => 'Graph Domain', +'graph end' => 'Graph End', +'graph of average tcp transfer duration' => 'Average TCP Transfer Duration', +'graph of average udp transfer duration' => 'Average UDP Transfer Duration', +'graph of tcp accesses' => 'TCP Accesses (5 minute total)', +'graph of tcp transfers' => 'TCP Transfers (5 minute total)', +'graph of udp accesses' => 'UDP Accesses (5 minute total)', +'graph of udp transfers' => 'UDP Transfers (5 minute total)', +'graph start' => 'Graph Start', +'hours' => 'hours', +'lines analyzed' => 'Lines analyzed<br />(access.log)', +'lines sec' => 'lines/sec', +'lines' => 'lines', +'no information available' => 'No information available.', +'percent cache hits' => '% Cache Hits', +'percent cache misses' => '% Cache Misses', +'per hour' => 'per hour', +'proxy access graphs' => 'Proxy access graphs', +'seconds' => 'second(s)', +'ssproxy graphs' => 'Proxy Graphs', +'total accesses' => 'Total Accesses', +'total cache hits' => 'Total Cache Hits', +'total cache ims hits' => 'Total Cache IMS Hits', +'total cache misses' => 'Total Cache Misses', +'total transfers' => 'Total Transfers', + +); + +#EOF diff --git a/src/squid-graph/squid-graph.es.pl b/src/squid-graph/squid-graph.es.pl new file mode 100644 index 000000000..a113e1203 --- /dev/null +++ b/src/squid-graph/squid-graph.es.pl @@ -0,0 +1,10 @@ +%tr = ( +%tr, + +'no information available' => 'No hay información disponible', +'proxy access graphs' => 'Gráficas de acceso al proxy', +'ssproxy graphs' => 'Gráficas de proxy', + +); + +#EOF diff --git a/src/squid-graph/squid-graph.fr.pl b/src/squid-graph/squid-graph.fr.pl new file mode 100644 index 000000000..a2c59f50d --- /dev/null +++ b/src/squid-graph/squid-graph.fr.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'Aucune information disponible.', +'proxy access graphs' => 'Graphiques des accès proxy', +'ssproxy graphs' => 'Graphiques du proxy', +); + +#EOF diff --git a/src/squid-graph/squid-graph.it.pl b/src/squid-graph/squid-graph.it.pl new file mode 100644 index 000000000..6d2a3a5a9 --- /dev/null +++ b/src/squid-graph/squid-graph.it.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'No information available.', +'proxy access graphs' => 'Proxy access graphs', +'ssproxy graphs' => 'Proxy Graphs', +); + +#EOF diff --git a/src/squid-graph/squid-graph.nl.pl b/src/squid-graph/squid-graph.nl.pl new file mode 100644 index 000000000..b3a2105e0 --- /dev/null +++ b/src/squid-graph/squid-graph.nl.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'Geen informatie beschikbaar.', +'proxy access graphs' => 'Proxy toegangsgrafieken', +'ssproxy graphs' => 'Proxy grafieken', +); + +#EOF diff --git a/src/squid-graph/squid-graph.pl.pl b/src/squid-graph/squid-graph.pl.pl new file mode 100644 index 000000000..254286f1a --- /dev/null +++ b/src/squid-graph/squid-graph.pl.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'Brak dostępnych informacji.', +'proxy access graphs' => 'Wykresy dostępu do Proxy', +'ssproxy graphs' => 'Wykresy Proxy', +); + +#EOF diff --git a/src/squid-graph/squid-graph.ru.pl b/src/squid-graph/squid-graph.ru.pl new file mode 100644 index 000000000..6d2a3a5a9 --- /dev/null +++ b/src/squid-graph/squid-graph.ru.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'No information available.', +'proxy access graphs' => 'Proxy access graphs', +'ssproxy graphs' => 'Proxy Graphs', +); + +#EOF diff --git a/src/squid-graph/squid-graph.tr.pl b/src/squid-graph/squid-graph.tr.pl new file mode 100644 index 000000000..139fa2aa1 --- /dev/null +++ b/src/squid-graph/squid-graph.tr.pl @@ -0,0 +1,9 @@ +%tr = ( +%tr, + +'no information available' => 'Herhangi bir bilgi bulunmamaktadır.', +'proxy access graphs' => 'Vekil sunucu erişim grafiği', +'ssproxy graphs' => 'Vekil Sunucu Grafikleri', +); + +#EOF diff --git a/src/squid-graph/update-squid-graph.sh b/src/squid-graph/update-squid-graph.sh new file mode 100644 index 000000000..4251607f7 --- /dev/null +++ b/src/squid-graph/update-squid-graph.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +### +### Squid-Graphs +### +if [ -e "/var/log/squid/access.log" ]; then + /usr/bin/squid-graph --no-console-log --tcp-only --output-dir=/srv/web/ipfire/html/sgraph < /var/log/squid/access.log >/dev/null 2>&1; +fi -- 2.15.1

1 0

[PATCH] update nagios_nrpe to 3.2.1
by Peter Müller 08 Dec '17

08 Dec '17

Update Nagios NRPE server to version 3.2.1, which fixes several bugs and security issues. Changelog: https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- lfs/nagios_nrpe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 050c9294f..e211961be 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -24,7 +24,7 @@ include Config -VER = 2.12 +VER = 3.2.1 THISAPP = nrpe-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios_nrpe -PAK_VER = 2 +PAK_VER = 3 DEPS = "nagios" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97 +$(DL_FILE)_MD5 = 8997e195fea93cdceb8c7ed8ac1d43bc install : $(TARGET) -- 2.13.6

1 0

[PATCH] update tor to 0.3.1.9
by Peter Müller 08 Dec '17

08 Dec '17

Release Notes: https://gitweb.torproject.org/tor.git/plain/ReleaseNotes?id=tor-0.3.1.9 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index 6ca79f68a..af84d186e 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.3.1.7 +VER = 0.3.1.9 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 24 +PAK_VER = 25 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ec7c9f588c9e1a42c09bcc097a1e55eb +$(DL_FILE)_MD5 = 585e62d086ae7df7cd873f735d726118 install : $(TARGET) -- 2.13.6

1 0

ASN support for iptables
by Peter Müller 05 Dec '17

05 Dec '17

Hello development list, today, I'd like to discuss whether a new feature in the firewall engine of IPFire makes sense or not. Since Core Update 90, IPFire supports GeoIP based firewall rules, which goes beyond simple IP addresses or CIDR blocks and makes firewalling easier. The idea I had in mind is to add ASN (Autonomous System Number) support for firewall rules, too. An AS (Autonomous System) can be described as an administrative instance on top of IP: For example, several IP blocks belong to an AS, i.e. to the same company, university or whatever. Although these blocks may be used for completely different purposes in completely different countries, they share the same owner. Every AS has a number (ASN) and a description (sometimes abbreviated to ASDescr), while the number is unique. There are some scenarios in which AS based firewall rules make sense, since AS information change less seldom than IP ranges: (a) One wants to block malicious traffic, but blocking entire countries is too much since there are some legitimate partners, customers, ... out there. With AS support, it is possible to grant them access by simply permitting their AS. The rest of the country may now safely be blocked. (b) In some cases, IP ranges change very often, making firewall rules very complex and hard to maintain, or the exact IP address of a machine cannot be determined (dial-up connections). In both cases, the AS (mostly) stays the same and allows firewall rules without permitting access to a whole country. (c) Rogue ISPs (networks which are controlled/operated by professional spammers or worse, such as the "Russian Business Network" (RBN), which died in end-2007) sometimes run networks located in "good" countries such as US or NL. Blocking them by GeoIP is not an option because of many false-positives. AS based rules may help here. Since the data behind this can be extracted from BGP feeds, no external databases (such as MaxMind) are required. Unfortunately, my programming skills are too low for implementing this feature. Thereof, if it is decided to do this, I will need some help here. :-) Technically, this is similar to the GeoIP firewall stuff (just another database), so I assume most of the work done there can just be copied. Any thoughts on this idea? Best regards, Peter Müller

2 7

[PATCH] openssh: update to 7.6p1
by Peter Müller 05 Dec '17

05 Dec '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)link38.eu> --- lfs/openssh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/openssh b/lfs/openssh index 56ac55a96..ff75a65f9 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 7.4p1 +VER = 7.6p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b2db2a83caf66a208bb78d6d287cdaa3 +$(DL_FILE)_MD5 = 06a88699018e5fef13d4655abfed1f63 install : $(TARGET) -- 2.14.2

1 0

[PATCH] disable Apache server signature
by Peter Müller 05 Dec '17

05 Dec '17

Sending the server signature is unnecessary and might leak some internal information (although ServerTokens is already set to "Prod"). Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- config/httpd/global.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/httpd/global.conf b/config/httpd/global.conf index 6cc69b55e..cc8000379 100644 --- a/config/httpd/global.conf +++ b/config/httpd/global.conf @@ -1,5 +1,5 @@ Timeout 300 -ServerSignature on +ServerSignature off UseCanonicalName off ServerTokens Prod LogLevel warn -- 2.13.6

1 0

[PATCH] Update for numerous lfs-files: removed deprecated configure options
by Matthias Fischer 04 Dec '17

04 Dec '17

Hello, During one of the last building sessions I noticed about 70 warnings considering "configure: WARNING: unrecognized options: ..." in '_build.ipfire.log' and (e.g.). Not really important, but ugly. Looks unprofessional. So I tried to clean things up and did some cosmetics. Please pull from git://git.ipfire.org/people/mfischer/ipfire-2.x.git next to get these changes. The only remaining warnings are "--with-tclinclude, --enable-shared, --enable-threads", dealing with 'tcl8.6.6'. Didn't find the right spot to get rid of these yet. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/autoconf | 4 +++- lfs/automake | 6 ++++-- lfs/cyrus-imapd | 17 ++++++++++++----- lfs/dhcp | 1 - lfs/e2fsprogs | 2 +- lfs/expat | 4 +++- lfs/faad2 | 5 ++++- lfs/fcron | 32 ++++++++++++++++---------------- lfs/ffmpeg | 1 + lfs/fuse | 6 ++++-- lfs/ghostscript | 4 ++-- lfs/gmp | 4 +--- lfs/groff | 4 +++- lfs/gzip | 4 ++-- lfs/kmod | 1 - lfs/less | 5 ++++- lfs/libjpeg-compat | 6 +++++- lfs/libmpeg2 | 5 ++++- lfs/libtool | 4 +++- lfs/libupnp | 4 +++- lfs/libusb | 4 +++- lfs/m4 | 6 +++--- lfs/mpfr | 3 ++- lfs/nasm | 4 +++- lfs/openssh | 46 +++++++++++++++++++++++++--------------------- lfs/openvmtools | 22 +++++++++++++++------- lfs/patch | 6 +++--- lfs/python | 5 ++++- lfs/python3 | 5 ++++- lfs/rpcbind | 7 ++++++- lfs/shadow | 14 ++++++++------ lfs/taglib | 4 ++-- lfs/tcl | 4 ++-- 33 files changed, 155 insertions(+), 94 deletions(-) diff --git a/lfs/autoconf b/lfs/autoconf index 9c58e20cc..7e622da86 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -69,7 +69,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/automake b/lfs/automake index 15bdad1e5..0b3d9cce8 100644 --- a/lfs/automake +++ b/lfs/automake @@ -81,8 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch - cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \ - --docdir=/usr/share/doc/automake-1.15 + cd $(DIR_APP) && ./configure \ + --prefix=$(PREFIX) \ + --docdir=/usr/share/doc/automake-1.15 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 73f73e18c..7dea649a3 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \ - --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \ - --with-auth=unix --with-perl --with-sasl --with-idle=idled \ - --with-syslogfacility=MAIL --enable-listext --without-snmp \ - --enable-autocreate --enable-idled + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --with-service-path=/usr/lib/cyrus \ + --with-cyrus-prefix=/usr/lib/cyrus \ + --sysconfdir=/var/ipfire/cyrusimap \ + --with-perl \ + --with-sasl \ + --with-syslogfacility=MAIL \ + --without-snmp \ + --enable-autocreate \ + --enable-idled + cd $(DIR_APP) && make $(EXTRA_MAKE) cd $(DIR_APP) && make install -mkdir /var/imap diff --git a/lfs/dhcp b/lfs/dhcp index 4c613a7d8..262a25129 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -107,7 +107,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --sysconfdir=/etc/dhcp \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ - --disable-static \ --enable-paranoia \ --enable-early-chroot \ --disable-dhcpv6 diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 90e28ac07..8e265c1e2 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -76,8 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --with-root-prefix="" \ --enable-elf-shlibs \ - --disable-evms \ --disable-nls + cd $(DIR_APP)/build && make $(MAKETUNING) cd $(DIR_APP)/build && make install cd $(DIR_APP)/build && make install-libs diff --git a/lfs/expat b/lfs/expat index aa9759094..5bb22ec27 100644 --- a/lfs/expat +++ b/lfs/expat @@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP) diff --git a/lfs/faad2 b/lfs/faad2 index bd258f79a..7cadb9aef 100644 --- a/lfs/faad2 +++ b/lfs/faad2 @@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/fcron b/lfs/fcron index 5cc2cd62a..b548c1310 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -70,22 +70,22 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-nls \ - --without-sendmail \ - --with-spooldir=/var/spool/cron \ - --with-fifodir=/var/run \ - --with-piddir=/var/run \ - --sysconfdir=/etc \ - --with-username=cron \ - --with-groupname=cron \ - --with-run-non-privileged=no \ - --with-fcrondyn=no \ - --with-sysfcrontab=no \ - --with-boot-install=no \ - --with-pam=no \ - --with-selinux=no + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --without-sendmail \ + --with-spooldir=/var/spool/cron \ + --with-fifodir=/var/run \ + --with-piddir=/var/run \ + --sysconfdir=/etc \ + --with-username=cron \ + --with-groupname=cron \ + --with-run-non-privileged=no \ + --with-fcrondyn=no \ + --with-sysfcrontab=no \ + --with-boot-install=no \ + --with-pam=no \ + --with-selinux=no + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install echo "root" > /etc/fcron.allow diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 77258a0ed..258e29b7b 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-version3 \ --enable-avfilter \ --enable-avresample + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/fuse b/lfs/fuse index 2639156b2..275647252 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -74,7 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/ghostscript b/lfs/ghostscript index 7ee1ce4e4..6d297dabc 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ - --with-system-libtiff \ - --with-install-cups + --with-system-libtiff + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/gmp b/lfs/gmp index 8dc9b7350..4d55e4f76 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -39,9 +39,7 @@ endif CONFIGURE_OPTIONS = \ --prefix=/usr \ - --enable-cxx \ - --enable-mpbsd \ - --disable-nls + --enable-cxx ############################################################################### # Top-level Rules diff --git a/lfs/groff b/lfs/groff index a0bb0bd3f..e4c293bb7 100644 --- a/lfs/groff +++ b/lfs/groff @@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls + cd $(DIR_APP) && PAGE=A4 ./configure \ + --prefix=/usr + cd $(DIR_APP) && make cd $(DIR_APP) && make install ln -svf eqn /usr/bin/geqn diff --git a/lfs/gzip b/lfs/gzip index 12fae78e9..233c6ce40 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -35,10 +35,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin + EXTRA_CONFIG = --prefix=/usr --bindir=/bin else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls + EXTRA_CONFIG = --prefix=$(TOOLS_DIR) endif ############################################################################### diff --git a/lfs/kmod b/lfs/kmod index dc2dc10b8..8e0bb0d53 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ - --enable-zlib \ --disable-manpages # --libdir=/lib \ diff --git a/lfs/less b/lfs/less index 3a3548338..10528d866 100644 --- a/lfs/less +++ b/lfs/less @@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat index 4166d52c7..0e712d0c2 100644 --- a/lfs/libjpeg-compat +++ b/lfs/libjpeg-compat @@ -72,7 +72,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static \ + --enable-shared + cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/ diff --git a/lfs/libmpeg2 b/lfs/libmpeg2 index 6d664c9f0..488a59737 100644 --- a/lfs/libmpeg2 +++ b/lfs/libmpeg2 @@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared \ + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ --disable-accel-detect + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/libtool b/lfs/libtool index 017214505..d7e9a1555 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -75,7 +75,9 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/libupnp b/lfs/libupnp index 3f8d2b549..18f5e6d8a 100644 --- a/lfs/libupnp +++ b/lfs/libupnp @@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/libusb b/lfs/libusb index f557bd8be..f7fc12420 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules diff --git a/lfs/m4 b/lfs/m4 index 3864d4215..5bb860444 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -35,12 +35,12 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls + EXTRA_CONFIG = --prefix=/usr EXTRA_MAKE = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls - EXTRA_MAKE = + EXTRA_CONFIG = --prefix=$(TOOLS_DIR) + EXTRA_MAKE = endif ############################################################################### diff --git a/lfs/mpfr b/lfs/mpfr index f729b8fe2..cb5a29b10 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ - --enable-thread-safe --disable-nls + --enable-thread-safe + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/nasm b/lfs/nasm index 6eb34f101..5968dce72 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/openssh b/lfs/openssh index 56ac55a96..20a5dc115 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -71,29 +71,33 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --libexecdir=/usr/lib/openssh --with-md5-passwords \ - --with-privsep-path=/var/empty --disable-nls \ - --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/ssh \ + --libexecdir=/usr/lib/openssh \ + --with-md5-passwords \ + --with-privsep-path=/var/empty \ + --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install sed -i -e 's/^#\?Port .*$$/Port 222/' \ - -e 's/^#\?Protocol .*$$/Protocol 2/' \ - -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ - -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ - -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \ - -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ - -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ - -e 's/^#\?UsePAM .*$$//' \ - -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \ - -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \ - -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ - -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ - -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ - /etc/ssh/sshd_config + -e 's/^#\?Protocol .*$$/Protocol 2/' \ + -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ + -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ + -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \ + -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ + -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ + -e 's/^#\?UsePAM .*$$//' \ + -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \ + -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \ + -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ + -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ + -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ + /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/openvmtools b/lfs/openvmtools index 1cf9427fe..b5b1fefa2 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -81,13 +81,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac cd $(DIR_APP) && autoreconf -vfi - cd $(DIR_APP) && ./configure --prefix=/usr \ - --with-kernel-release=$(KVER)-ipfire --without-pam \ - --disable-unity --without-gtk2 --without-gtkmm \ - --without-procps --without-icu \ - --without-x --with-linuxdir=/usr/src/linux \ - --without-kernel-modules --disable-deploypkg \ - --without-xerces-c --without-xerces + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --with-kernel-release=$(KVER)-ipfire \ + --without-pam \ + --without-gtk2 \ + --without-gtkmm \ + --without-procps \ + --without-icu \ + --without-x \ + --with-linuxdir=/usr/src/linux \ + --without-kernel-modules \ + --disable-deploypkg \ + --without-xerces + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install #install initscripts diff --git a/lfs/patch b/lfs/patch index c938ac8fa..065314d51 100644 --- a/lfs/patch +++ b/lfs/patch @@ -35,14 +35,14 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls + EXTRA_CONFIG = --prefix=/usr EXTRA_MAKE = EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls + EXTRA_CONFIG = --prefix=$(TOOLS_DIR) EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_INSTALL = endif ############################################################################### diff --git a/lfs/python b/lfs/python index 14ccb690c..70299852c 100644 --- a/lfs/python +++ b/lfs/python @@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ - --prefix=/usr --enable-shared --with-system-ffi + --prefix=/usr \ + --enable-shared \ + --with-system-ffi + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/python3 b/lfs/python3 index 0fe493ba9..e753d96ab 100644 --- a/lfs/python3 +++ b/lfs/python3 @@ -79,7 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ - --prefix=/usr --enable-shared --with-system-ffi + --prefix=/usr \ + --enable-shared \ + --with-system-ffi + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/rpcbind b/lfs/rpcbind index 046121f36..c1b696de7 100644 --- a/lfs/rpcbind +++ b/lfs/rpcbind @@ -79,7 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch - cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6 + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --bindir=/sbin \ + --with-rpcuser=root \ + --without-systemdsystemunitdir + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install #install initscripts diff --git a/lfs/shadow b/lfs/shadow index c445dd362..30000bfa1 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -71,12 +71,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch - cd $(DIR_APP) && ./configure --libdir=/lib \ - --sysconfdir=/etc \ - --enable-shared \ - --without-selinux \ - --disable-nls \ - --with-group-name-max-length=32 + cd $(DIR_APP) && ./configure \ + --libdir=/lib \ + --sysconfdir=/etc \ + --enable-shared \ + --without-selinux \ + --disable-nls \ + --with-group-name-max-length=32 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/taglib b/lfs/taglib index eec6e97e9..058a15542 100644 --- a/lfs/taglib +++ b/lfs/taglib @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared + cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/tcl b/lfs/tcl index 7762a1dc8..fb464dca3 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -76,9 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) ifneq "$(ROOT)" "" - cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) --disable-nls + cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) else - cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP)/unix && ./configure --prefix=/usr endif cd $(DIR_APP)/unix && make $(MAKETUNING) cd $(DIR_APP)/unix && make install -- 2.15.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development December 2017