webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into kernel-4.14

Browse Source
This commit is contained in:
Arne Fitzenreiter
2017-11-29 17:37:51 +01:00
parent f952832418 a679c56367
commit 5b117ef49a
131 changed files with 9827 additions and 13353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/backup/includes/pound
View File

@@ -1 +0,0 @@
/etc/pound.cfg

2
config/backup/includes/vsftpd
View File

@@ -1,2 +0,0 @@
/etc/vsftpd.conf
/etc/vsftpd.user_list

2
config/ca-certificates/build.sh
View File

@@ -4,7 +4,7 @@ set -e
# Create file layout.
mkdir -pv certs certs/legacy-default certs/legacy-disable
cp certdata.txt ipfire-ca.crt certs
cp certdata.txt certs
cd certs
python ../certdata2pem.py

15989
config/ca-certificates/certdata.txt
View File

File diff suppressed because it is too large Load Diff

42
config/ca-certificates/ipfire-ca.crt
View File

@@ -1,42 +0,0 @@
# alias="IPFire CA"
# trust=CKA_TRUST_SERVER_AUTH
# distrust=
# openssl-trust=serverAuth
-----BEGIN CERTIFICATE-----
MIIGrDCCBJSgAwIBAgIJAJIvs+XE5h41MA0GCSqGSIb3DQEBDQUAMGgxCzAJBgNV
BAYTAkRFMRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UEAwwRSVBGaXJl
IFByb2plY3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJAaXBmaXJlLm9y
ZzAeFw0xNTAxMzExNzMyNDFaFw0yNTAxMjgxNzMyNDFaMGgxCzAJBgNVBAYTAkRF
MRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UEAwwRSVBGaXJlIFByb2pl
Y3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJAaXBmaXJlLm9yZzCCAiIw
DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANjqPsfhHX2Zg5nat3ZT0XdbWqVu
z0G2Supepa8eWzPtxIC6NDt8gAPGQcbgqL2gIYrUISaNQ3R99/XCWdu398cliw+6
z9W1dh/YHzjyHDqpV+C6ufNuw2n4D4E9TfgZzlMnk3iluYOXJXZUN8T0PQbP3oHV
KfH0fIlrj7LVT9cewLjpe2XzuevyBxqK42ioR0ax+yaZPxS3eHWdPpqRitfGFIx9
O9jgj465z6Y0S7n6Z3cV49IN5ZvSBTAZYuBNlW5bEgOpqC13CJZMbOLS8wUbh4Ql
Mklpo0dF3yYZne4Za0pcRqQB4AfvZnrggLF/AyHQab9Kia5PBAkVNXW2ApCH14v7
h9bQ7KMoxaZ9WFBKchFVu36CmJLPI1HsSqV/+6HnMOd5Rd8GAN2/2uLiUSFIrpAD
3eXenr+CFEeq4P3UKSzMG3wTd3y1JWSCnvKaK0GTEOdvk4C7L8V4KO29w3NRI2a8
NEUQ3xa15gT3dRtqBvq151Vzd+PmptyI5uzbTVqfbkiMRbeq4CvJ5HkI+l0kuest
37CLNeqldHnsAe2ziTFE1UbnYk3r6r6KLn4xAraVntFCYpQavzwtE7UdHFeCMAlu
zVrc3GyEigG+NqY2lp18JtUw1S1XAQGO7XGQTPfSDx2eRxrqQx/Voc4hxKsifSvQ
kTVrQkP173khAfTtAgMBAAGjggFXMIIBUzAdBgNVHQ4EFgQUxl27sebgR5PcYCcA
SrdiG1QiKogwgZoGA1UdIwSBkjCBj4AUxl27sebgR5PcYCcASrdiG1QiKoihbKRq
MGgxCzAJBgNVBAYTAkRFMRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UE
AwwRSVBGaXJlIFByb2plY3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJA
aXBmaXJlLm9yZ4IJAJIvs+XE5h41MBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYDVR0P
BAQDAgEGMCAGA1UdEQQZMBeBFWNlcnRtYXN0ZXJAaXBmaXJlLm9yZzAgBgNVHRIE
GTAXgRVjZXJ0bWFzdGVyQGlwZmlyZS5vcmcwMAYDVR0fBCkwJzAloCOgIYYfaHR0
cDovL2NlcnRzLmlwZmlyZS5vcmcvY3JsLnBlbTANBgkqhkiG9w0BAQ0FAAOCAgEA
HUXBFAC0AM/AhAp0mykBTY0QChI6YaXX1ki8Nb1sschcC53rnykHELPLMLKbSCLG
cM7lJc1GJeDvQ9O46/Z7EWpFDACCstVn/hXUmj4ZxCSZ4B+L6Xt+GMdTksY434nS
voM4fgc9a/OG6Tr2+YN9/rhnU3WdyMjpdApVFLs0qfzDHKmCTzC0h7itRSvitHOa
p7yRQnErKy6GFSjSgSG1mhZbghJhGzrYRjCuAa59+R74IE+3ZWtpPUHro+S4kMcQ
5NZLEwf0w5KzZcRF50UTSBxIUcBrtWRJElxRc9MncTaAS/uP6GBTkOM+f1WZ+zH0
iRU5Sy4k/YfIxAU89QwMVW4GXktjIIXXbzbofaezKge3qc2v8dpI/V/U6I9mARja
ltosmfE4lVBEJtQe6rNVUO55AiMnYpuC5hWjxhKjgeYQug+/nW9IIzCc5Ny7w8fb
5NR0UqI/0TeS4Z1mNM8d6I5q41NuVSDU+6izUxDGgDL3ZWRkG6VWG1sRGxWMJb2L
n3E6Zp51AY/l9e2gFqGFearanLw1w3lk2rEyYVHpZIKSjHEfUusOzuLFRaW95pgj
HSJ0+XVE3cH/ppDBlxM0psrpOylXm3EaRnIPl2cGWjZwTIqga8PRJA9FefzMDGIX
bQMywe8LR6okWvXhTV0wl0F6ynOiKE8LmbDf5si0EBU=
-----END CERTIFICATE-----

23
config/cfgroot/geoip-functions.pl
View File

@@ -23,8 +23,23 @@
package GeoIP;
use Geo::IP::PurePerl;
use Locale::Codes::Country;
my $database;
sub lookup($) {
my $address = shift;
# Load the database into memory if not already done
if (!$database) {
$database = Geo::IP::PurePerl->new(GEOIP_MEMORY_CACHE);
}
# Return the name of the country
return $database->country_code_by_name($address);
}
# Function to get the flag icon for a specified country code.
sub get_flag_icon($) {
my ($input) = @_;
@@ -63,10 +78,10 @@ sub get_flag_icon($) {
# the icon for "unknown".
my $ccode = "unknown";
# Redoing all the stuff from abouve for the "unknown" icon.
my $file = join('.', $ccode,$ext);
my $flag_icon = join('/', $flagdir,$file);
my $absolute_path = join('', $webroot,$flag_icon);
# Redoing all the stuff from above for the "unknown" icon.
my $file = join('.', $ccode, $ext);
my $flag_icon = join('/', $flagdir, $file);
my $absolute_path = join('', $webroot, $flag_icon);
# Check if the icon is present.
if (-e "$absolute_path") {

16
config/cfgroot/network-functions.pl
View File

@@ -108,10 +108,14 @@ sub network_equal {
my $network1 = shift;
my $network2 = shift;
my $bin1 = &network2bin($network1);
my $bin2 = &network2bin($network2);
my @bin1 = &network2bin($network1);
my @bin2 = &network2bin($network2);
if ($bin1 eq $bin2) {
if (!defined $bin1 || !defined $bin2) {
return undef;
}
if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
return 1;
}
@@ -133,6 +137,10 @@ sub network2bin($) {
my $address_bin = &ip2bin($address);
my $netmask_bin = &ip2bin($netmask);
if (!defined $address_bin || !defined $netmask_bin) {
return undef;
}
my $network_start = $address_bin & $netmask_bin;
return ($network_start, $netmask_bin);
@@ -457,7 +465,7 @@ sub testsuite() {
assert(!$result);
$result = &network_equal("192.168.0.1/24", "192.168.0.XXX/24");
assert($result);
assert(!$result);
$result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8");
assert($result);

1
config/etc/group
View File

@@ -19,7 +19,6 @@ ntp:x:38:
dip:x:40:
mysql:x:41:
ftp:x:45:
vsftpd:x:47:
rsyncd:x:48:
stunnel:x:51:
lock:x:54:

1
config/etc/passwd
View File

@@ -6,7 +6,6 @@ squid:x:23:23:ftp:/var/spool/squid:/bin/false
ntp:x:38:38::/etc/ntp:/bin/false
mysql:x:41:41:MySQL Server:/dev/null:/bin/false
ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
vsftpd:x:47:47:vsftpd User:/home/ftp:/bin/false
rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
sshd:x:74:74:sshd:/var/empty:/bin/false

2
config/httpd/vhosts.d/ipfire-interface-ssl.conf
View File

@@ -11,6 +11,8 @@
SSLProtocol all -SSLv2 -SSLv3
SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:CAMELLIA128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:CAMELLIA256-SHA
SSLHonorCipherOrder on
SSLCompression off
SSLSessionTickets off
SSLCertificateFile /etc/httpd/server.crt
SSLCertificateKeyFile /etc/httpd/server.key
SSLCertificateFile /etc/httpd/server-ecdsa.crt

3
config/rootfiles/common/i586/strongswan-padlock
View File

@@ -1,3 +0,0 @@
etc/strongswan.d/charon/padlock.conf
usr/lib/ipsec/plugins/libstrongswan-padlock.so
#usr/share/strongswan/templates/config/plugins/padlock.conf

9
config/rootfiles/common/strongswan
View File

@@ -19,6 +19,7 @@ etc/strongswan.d/charon/attr.conf
etc/strongswan.d/charon/ccm.conf
etc/strongswan.d/charon/cmac.conf
etc/strongswan.d/charon/constraints.conf
etc/strongswan.d/charon/counters.conf
etc/strongswan.d/charon/ctr.conf
etc/strongswan.d/charon/curl.conf
etc/strongswan.d/charon/curve25519.conf
@@ -39,9 +40,9 @@ etc/strongswan.d/charon/gmp.conf
etc/strongswan.d/charon/hmac.conf
etc/strongswan.d/charon/kernel-netlink.conf
etc/strongswan.d/charon/md5.conf
etc/strongswan.d/charon/mgf1.conf
etc/strongswan.d/charon/nonce.conf
etc/strongswan.d/charon/openssl.conf
#etc/strongswan.d/charon/padlock.conf
etc/strongswan.d/charon/pem.conf
etc/strongswan.d/charon/pgp.conf
etc/strongswan.d/charon/pkcs1.conf
@@ -123,6 +124,7 @@ usr/lib/ipsec/plugins/libstrongswan-attr.so
usr/lib/ipsec/plugins/libstrongswan-ccm.so
usr/lib/ipsec/plugins/libstrongswan-cmac.so
usr/lib/ipsec/plugins/libstrongswan-constraints.so
usr/lib/ipsec/plugins/libstrongswan-counters.so
usr/lib/ipsec/plugins/libstrongswan-ctr.so
usr/lib/ipsec/plugins/libstrongswan-curl.so
usr/lib/ipsec/plugins/libstrongswan-curve25519.so
@@ -143,9 +145,9 @@ usr/lib/ipsec/plugins/libstrongswan-gmp.so
usr/lib/ipsec/plugins/libstrongswan-hmac.so
usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
usr/lib/ipsec/plugins/libstrongswan-md5.so
usr/lib/ipsec/plugins/libstrongswan-mgf1.so
usr/lib/ipsec/plugins/libstrongswan-nonce.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
#usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
usr/lib/ipsec/plugins/libstrongswan-pgp.so
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
@@ -207,6 +209,7 @@ usr/sbin/swanctl
#usr/share/strongswan/templates/config/plugins/ccm.conf
#usr/share/strongswan/templates/config/plugins/cmac.conf
#usr/share/strongswan/templates/config/plugins/constraints.conf
#usr/share/strongswan/templates/config/plugins/counters.conf
#usr/share/strongswan/templates/config/plugins/ctr.conf
#usr/share/strongswan/templates/config/plugins/curl.conf
#usr/share/strongswan/templates/config/plugins/curve25519.conf
@@ -227,9 +230,9 @@ usr/sbin/swanctl
#usr/share/strongswan/templates/config/plugins/hmac.conf
#usr/share/strongswan/templates/config/plugins/kernel-netlink.conf
#usr/share/strongswan/templates/config/plugins/md5.conf
#usr/share/strongswan/templates/config/plugins/mgf1.conf
#usr/share/strongswan/templates/config/plugins/nonce.conf
#usr/share/strongswan/templates/config/plugins/openssl.conf
#usr/share/strongswan/templates/config/plugins/padlock.conf
#usr/share/strongswan/templates/config/plugins/pem.conf
#usr/share/strongswan/templates/config/plugins/pgp.conf
#usr/share/strongswan/templates/config/plugins/pkcs1.conf

0
config/rootfiles/core/116/exclude → config/rootfiles/core/117/exclude
View File

29
config/rootfiles/core/117/filelists/files Normal file
View File

@@ -0,0 +1,29 @@
etc/system-release
etc/issue
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/rc.d/init.d/apache
etc/ssl/certs/ca-bundle.crt
etc/ssl/certs/ca-bundle.trust.crt
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/captive.cgi
srv/web/ipfire/cgi-bin/country.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/logs.cgi/config.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
srv/web/ipfire/cgi-bin/logs.cgi/ids.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/darkdos/include/functions.pl
srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/functions.pl
usr/local/bin/captivectrl
usr/local/bin/syslogdctrl
var/ipfire/geoip-functions.pl
var/ipfire/network-functions.pl

1
config/rootfiles/core/117/filelists/strongswan Symbolic link
View File

@@ -0,0 +1 @@
../../../common/strongswan

0
config/rootfiles/core/116/meta → config/rootfiles/core/117/meta
View File

55
src/paks/pound/install.sh → config/rootfiles/core/117/update.sh
View File

@@ -5,7 +5,7 @@
# #
# 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 #
# the Free Software Foundation; either version 3 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
@@ -17,16 +17,57 @@
# 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@ipfire.org>. #
# Copyright (C) 2017 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=117
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
# Stop services
ipsec stop
# Extract files
extract_files
restore_backup ${NAME}
ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20pound
ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound
ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20pound
# update linker config
ldconfig
start_service --background ${NAME}
# Make apache keys not readable for everyone
chmod 600 \
/etc/httpd/server.key \
/etc/httpd/server-ecdsa.key
# Update Language cache
/usr/local/bin/update-lang-cache
# Start services
/etc/init.d/apache reload
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
ipsec start
fi
# This update need a reboot...
#touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
sendprofile
# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
grub-mkconfig -o /boot/grub/grub.cfg
fi
sync
# Don't report the exitcode last command
exit 0

30
config/rootfiles/oldcore/116/exclude Normal file
View File

@@ -0,0 +1,30 @@
boot/config.txt
boot/grub/grub.cfg
boot/grub/grubenv
etc/alternatives
etc/collectd.custom
etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
var/ipfire/dma
var/ipfire/time
var/ipfire/ovpn
var/lib/alternatives
var/log/cache
var/log/dhcpcd.log
var/log/messages
var/state/dhcp/dhcpd.leases
var/updatecache

0
config/rootfiles/core/116/filelists/apache2 → config/rootfiles/oldcore/116/filelists/apache2
View File

0
config/rootfiles/core/116/filelists/files → config/rootfiles/oldcore/116/filelists/files
View File

0
config/rootfiles/core/116/filelists/i586/openssl-sse2 → config/rootfiles/oldcore/116/filelists/i586/openssl-sse2
View File

0
config/rootfiles/core/116/filelists/openssh → config/rootfiles/oldcore/116/filelists/openssh
View File

0
config/rootfiles/core/116/filelists/openssl → config/rootfiles/oldcore/116/filelists/openssl
View File

0
config/rootfiles/core/116/filelists/snort → config/rootfiles/oldcore/116/filelists/snort
View File

1
config/rootfiles/oldcore/116/filelists/wget Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wget

0
config/rootfiles/core/116/filelists/xz → config/rootfiles/oldcore/116/filelists/xz
View File

1
config/rootfiles/oldcore/116/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

3
config/rootfiles/core/116/update.sh → config/rootfiles/oldcore/116/update.sh
View File

@@ -33,6 +33,7 @@ done
# Stop services
/etc/init.d/snort stop
/etc/init.d/apache stop
# Extract files
extract_files
@@ -44,7 +45,7 @@ ldconfig
#/usr/local/bin/update-lang-cache
# Start services
/etc/init.d/apache restart
/etc/init.d/apache start
/etc/init.d/snort start
# This update need a reboot...

7
config/rootfiles/packages/pound
View File

@@ -1,7 +0,0 @@
etc/rc.d/init.d/pound
#etc/pound.cfg
usr/sbin/pound
usr/sbin/poundctl
#usr/share/man/man8/pound.8
#usr/share/man/man8/poundctl.8
var/ipfire/backup/addons/includes/pound

2
config/rootfiles/packages/sslscan
View File

@@ -1,2 +0,0 @@
usr/bin/sslscan
#usr/share/man/man1/sslscan.1

13
config/rootfiles/packages/vsftpd
View File

@@ -1,13 +0,0 @@
var/ipfire/backup/addons/includes/vsftpd
etc/rc.d/init.d/vsftpd
etc/rc.d/rc0.d/K35vsftpd
etc/rc.d/rc6.d/K35vsftpd
etc/rc.d/rc3.d/S65vsftpd
etc/vsftpd.conf
etc/vsftpd.user_list
home/ftp
usr/sbin/vsftpd
#usr/share/man/man5/vsftpd.conf.5
#usr/share/man/man8/vsftpd.8
var/ftp
var/ftp/empty

51
config/vsftpd/vsftpd.conf
View File

@@ -1,51 +0,0 @@
# Default config for vsftpd on ipfire
background=YES
listen=YES
#
nopriv_user=vsftpd
#
local_enable=YES
write_enable=YES
#
local_umask=022
#
#anonymous_enable=YES
#anon_upload_enable=YES
#anon_mkdir_write_enable=YES
#
dirmessage_enable=YES
#
xferlog_enable=YES
xferlog_file=/var/log/vsftpd.log
xferlog_std_format=YES
#
connect_from_port_20=YES
#
#chown_uploads=YES
#chown_username=whoever
#
idle_session_timeout=600
data_connection_timeout=120
#
#async_abor_enable=YES
#ascii_upload_enable=YES
#ascii_download_enable=YES
#
ftpd_banner=Welcome to IPFire FTP service.
#
chroot_local_user=YES
#chroot_list_enable=YES
secure_chroot_dir=/var/ftp/empty
#
ls_recurse_enable=YES
require_ssl_reuse=NO
#
#ssl_enable=YES
#force_local_data_ssl=NO
#force_local_logins_ssl=NO
#rsa_cert_file=/etc/vsftpd.pem
#
userlist_deny=NO
userlist_enable=YES
userlist_file=/etc/vsftpd.user_list
#

0
config/vsftpd/vsftpd.user_list
View File

6
doc/language_issues.de
View File

@@ -295,6 +295,7 @@ WARNING: translation string unused: geoipblock country name
WARNING: translation string unused: geoipblock flag
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -686,7 +687,6 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: 24 hours
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: bytes
@@ -737,15 +737,11 @@ WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
WARNING: untranslated string: info messages
WARNING: untranslated string: no data
WARNING: untranslated string: none
WARNING: untranslated string: one hour
WARNING: untranslated string: one month
WARNING: untranslated string: one week
WARNING: untranslated string: qos add subclass
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: unlimited
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn statistics n2n

1
doc/language_issues.en
View File

@@ -321,6 +321,7 @@ WARNING: translation string unused: geoipblock country name
WARNING: translation string unused: geoipblock flag
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration

6
doc/language_issues.es
View File

@@ -245,6 +245,7 @@ WARNING: translation string unused: geoipblock country name
WARNING: translation string unused: geoipblock flag
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -1020,11 +1021,13 @@ WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: log server protocol
WARNING: untranslated string: mac filter
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
@@ -1112,6 +1115,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
@@ -1134,6 +1138,7 @@ WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: ta key
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
@@ -1184,6 +1189,7 @@ WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.fr
View File

@@ -243,6 +243,7 @@ WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -1036,11 +1037,13 @@ WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: log server protocol
WARNING: untranslated string: mac filter
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
@@ -1124,6 +1127,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
@@ -1147,6 +1151,7 @@ WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: ta key
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
@@ -1197,6 +1202,7 @@ WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.it
View File

@@ -293,6 +293,7 @@ WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -837,6 +838,8 @@ WARNING: untranslated string: incoming compression in bytes per second
WARNING: untranslated string: incoming overhead in bytes per second
WARNING: untranslated string: info messages
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: log server protocol
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
WARNING: untranslated string: masquerade orange
@@ -856,6 +859,7 @@ WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: rdns
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
@@ -864,8 +868,10 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.nl
View File

@@ -292,6 +292,7 @@ WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -853,6 +854,8 @@ WARNING: untranslated string: incoming compression in bytes per second
WARNING: untranslated string: incoming overhead in bytes per second
WARNING: untranslated string: info messages
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: log server protocol
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
WARNING: untranslated string: masquerade orange
@@ -897,6 +900,7 @@ WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
@@ -910,8 +914,10 @@ WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ta key
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.pl
View File

@@ -245,6 +245,7 @@ WARNING: translation string unused: geoipblock country name
WARNING: translation string unused: geoipblock flag
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -1020,11 +1021,13 @@ WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: log server protocol
WARNING: untranslated string: mac filter
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
@@ -1112,6 +1115,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
@@ -1134,6 +1138,7 @@ WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: ta key
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
@@ -1184,6 +1189,7 @@ WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.ru
View File

@@ -239,6 +239,7 @@ WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -1022,11 +1023,13 @@ WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: invalid input for valid till days
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: log server protocol
WARNING: untranslated string: mac filter
WARNING: untranslated string: masquerade blue
WARNING: untranslated string: masquerade green
@@ -1108,6 +1111,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
@@ -1129,6 +1133,7 @@ WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: ta key
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
@@ -1179,6 +1184,7 @@ WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all

6
doc/language_issues.tr
View File

@@ -301,6 +301,7 @@ WARNING: translation string unused: geoipblock country name
WARNING: translation string unused: geoipblock flag
WARNING: translation string unused: green interface
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
WARNING: translation string unused: host configuration
@@ -792,17 +793,22 @@ WARNING: untranslated string: guardian service
WARNING: untranslated string: guardian watch snort alertfile
WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
WARNING: untranslated string: info messages
WARNING: untranslated string: invalid logserver protocol
WARNING: untranslated string: log server protocol
WARNING: untranslated string: no data
WARNING: untranslated string: one hour
WARNING: untranslated string: one month
WARNING: untranslated string: one week
WARNING: untranslated string: one year
WARNING: untranslated string: rdns
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: tcp more reliable
WARNING: untranslated string: twelve hours
WARNING: untranslated string: two weeks
WARNING: untranslated string: udp less overhead
WARNING: untranslated string: unlimited
WARNING: untranslated string: uplink bit rate
WARNING: untranslated string: vpn broken

1667
doc/language_missings
View File

File diff suppressed because it is too large Load Diff

4
html/cgi-bin/captive.cgi
View File

@@ -42,7 +42,7 @@ my %session_times = (
86400 => $Lang::tr{'24 hours'},
604800 => $Lang::tr{'one week'},
1209600 => $Lang::tr{'two weeks'},
18144000 => $Lang::tr{'one month'},
2592000 => $Lang::tr{'one month'},
31536000 => $Lang::tr{'one year'},
0 => "- $Lang::tr{'unlimited'} -",
);
@@ -757,7 +757,7 @@ sub generate_pdf() {
$f_subheadline->translate($cx, ($y + $h - $cy) / 2.4 + $cy);
if ($settings{'TITLE'}) {
$f_headline->text_center($settings{'TITLE'});
$f_headline->text_center(decode("utf8", $settings{'TITLE'}));
$f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
} else {
$f_headline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));

10
html/cgi-bin/country.cgi
View File

@@ -60,7 +60,7 @@ foreach my $country (@countries) {
$lines++;
# Convert country code into upper case.
my $country_uc = uc($country);
$country = uc($country);
# Get flag icon for of the country.
my $flag_icon = &GeoIP::get_flag_icon($country);
@@ -69,8 +69,8 @@ foreach my $country (@countries) {
my $name = &GeoIP::get_full_country_name($country);
if ($lines % 2) {
print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
print "<td $col>$country_uc</td>";
print "<td $col><a id='$country'><img src='$flag_icon' alt='$country' title='$country'/></a></td>";
print "<td $col>$country</td>";
print "<td $col>$name</td></tr>\n";
} else {
$lines2++;
@@ -80,8 +80,8 @@ foreach my $country (@countries) {
$col="style='background-color:${Header::table1colour};'";
}
print "<tr>";
print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
print "<td $col>$country_uc</td>";
print "<td $col><a id='$country'><img src='$flag_icon' alt='$country' title='$country'/></a></td>";
print "<td $col>$country</td>";
print "<td $col>$name</td>";
print "<td $col>&nbsp;</td>";

4
html/cgi-bin/credits.cgi
View File

@@ -41,7 +41,7 @@ print <<END
<p>$Lang::tr{'donation-text'}</p>
<div align="center">
<a href="http://www.ipfire.org/donate">
<a href="https://www.ipfire.org/donate">
<strong>$Lang::tr{'donation'}</strong>
</a>
</div>
@@ -54,7 +54,7 @@ END
print <<END
<br>
<center>
$Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b>
$Lang::tr{'visit us at'}: <b><a href='https://www.ipfire.org/' target="_blank">https://www.ipfire.org/</a></b>
</center>
<br><br>

2
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -73,7 +73,7 @@ if ( $querry[0] =~ "hwtemp"){
&Graphs::updatehddgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'harddisk temperature graphs'}, 1, '');
&Header::openpage($Lang::tr{'hardware graphs'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::getcgihash(\%sensorsettings);

2
html/cgi-bin/index.cgi
View File

@@ -210,7 +210,7 @@ END
print <<END;
<tr>
<td>
<b>$Lang::tr{'dns servers'}:</b>
<b><a href="netexternal.cgi">$Lang::tr{'dns servers'}</a>:</b>
</td>
<td style='text-align:center;'>
$dns_servers

14
html/cgi-bin/logs.cgi/config.dat
View File

@@ -33,6 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56';
my @VS = ('15','50','100','150','250','500');
$logsettings{'ENABLE_REMOTELOG'} = 'off';
$logsettings{'REMOTELOG_ADDR'} = '';
$logsettings{'REMOTELOG_PROTOCOL'} = 'udp';
$logsettings{'ACTION'} = '';
&Header::getcgihash(\%logsettings);
@@ -45,6 +46,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
{
$errormessage = $Lang::tr{'invalid logserver address'};
}
unless ($logsettings{'REMOTELOG_PROTOCOL'} =~ /^udp|tcp$/)
{
$errormessage = $Lang::tr{'invalid logserver protocol'};
}
}
unless ($logsettings{'LOGWATCH_KEEP'} =~ /^\d+$/)
{
@@ -69,6 +74,10 @@ $checked{'ENABLE_REMOTELOG'}{'off'} = '';
$checked{'ENABLE_REMOTELOG'}{'on'} = '';
$checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'";
$selected{'REMOTELOG_PROTOCOL'}{'udp'} = '';
$selected{'REMOTELOG_PROTOCOL'}{'tcp'} == '';
$selected{'REMOTELOG_PROTOCOL'}{$logsettings{'REMOTELOG_PROTOCOL'}} = "selected='selected'";
$checked{'LOGVIEW_REVERSE'}{'off'} = '';
$checked{'LOGVIEW_REVERSE'}{'on'} = '';
$checked{'LOGVIEW_REVERSE'}{$logsettings{'LOGVIEW_REVERSE'}} = "checked='checked'";
@@ -139,6 +148,11 @@ print <<END
<tr>
<td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /></td>
<td>$Lang::tr{'log server address'}</td><td><input type='text' name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td>
<td>$Lang::tr{'log server protocol'}</td><td>
<select name='REMOTELOG_PROTOCOL'>
<option value='udp' $selected{'REMOTELOG_PROTOCOL'}{'udp'}>$Lang::tr{'udp less overhead'}</option>
<option value='tcp' $selected{'REMOTELOG_PROTOCOL'}{'tcp'}>$Lang::tr{'tcp more reliable'}</option>
</select></td>
</tr>
</table>
END

9
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -13,7 +13,6 @@
#
use strict;
use Geo::IP::PurePerl;
use Getopt::Std;
# enable only the following on debugging purpose
@@ -352,9 +351,7 @@ foreach $_ (@log)
$srcport=$1 if $packet =~ /SPT=(\d+)/;
$dstport=$1 if $packet =~ /DPT=(\d+)/;
my $gi = Geo::IP::PurePerl->new();
my $ccode = $gi->country_code_by_name($srcaddr);
my $fcode = lc($ccode);
my $ccode = &GeoIP::lookup($srcaddr);
my $servi = uc(getservbyport($srcport, lc($proto)));
if ($servi ne '' && $srcport < 1024) {
@@ -386,10 +383,10 @@ foreach $_ (@log)
END
;
# Get flag icon for of the country.
my $flag_icon = &GeoIP::get_flag_icon($fcode);
my $flag_icon = &GeoIP::get_flag_icon($ccode);
if ( $flag_icon) {
print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode'></a></td>";
print "<td align='center' $col><a href='../country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode'></a></td>";
} else {
print "<td align='center' $col></td>";
}

4
html/cgi-bin/logs.cgi/firewalllogcountry.dat
View File

@@ -11,7 +11,6 @@
# and Michael Tremer (www.ipfire.org)
use strict;
use Geo::IP::PurePerl;
use Getopt::Std;
# enable only the following on debugging purpose
@@ -287,7 +286,6 @@ print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
my $red_interface = &General::get_red_interface();
my $linesjc = 0;
my %tabjc;
my $gi = Geo::IP::PurePerl->new();
if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber = $lines; };
$lines = 0;
@@ -310,7 +308,7 @@ foreach $_ (@log)
# Traffic from red
if($srcaddr ne '') {
# srcaddr is set
my $ccode = $gi->country_code_by_name($srcaddr);
my $ccode = &GeoIP::lookup($srcaddr);
if ($ccode eq '') {
$ccode = 'unknown';
}

7
html/cgi-bin/logs.cgi/firewalllogip.dat
View File

@@ -11,7 +11,6 @@
# and Michael Tremer (www.ipfire.org)
use strict;
use Geo::IP::PurePerl;
use Getopt::Std;
# enable only the following on debugging purpose
@@ -436,9 +435,7 @@ for($s=0;$s<$lines;$s++)
$col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>";
my $gi = Geo::IP::PurePerl->new();
my $ccode = $gi->country_code_by_name($key[$s]);
my $fcode = lc($ccode);
my $ccode = &GeoIP::lookup($key[$s]);
$color++;
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
@@ -448,7 +445,7 @@ for($s=0;$s<$lines;$s++)
my $flag_icon = &GeoIP::get_flag_icon($ccode);
if ( $flag_icon ) {
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";
} else {
print "<td align='center' $col></td>";
}

2
html/cgi-bin/logs.cgi/ids.dat
View File

@@ -387,7 +387,7 @@ sub processevent
}
($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport, $sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a");
@refs = ();
$_ =~ m/:([0-9]{1,4})\] (.*) \[\*\*\]/;
$_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/;
$title = &Header::cleanhtml($2,"y");
}
if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) {

5
html/cgi-bin/logs.cgi/showrequestfromcountry.dat
View File

@@ -13,9 +13,9 @@
#use CGI::Carp 'fatalsToBrowser';
#use strict;
use Geo::IP::PurePerl;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/geoip-functions.pl";
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
@@ -152,7 +152,6 @@ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
my $lines = 0;
my @log=();
my $country = $cgiparams{country};
my $gi = Geo::IP::PurePerl->new();
if (!$skip)
{
@@ -179,7 +178,7 @@ if (!$skip)
}
elsif($srcaddr ne '') {
# or srcaddr matches country code
my $ccode = $gi->country_code_by_name($srcaddr);
my $ccode = &GeoIP::lookup($srcaddr);
if($ccode eq uc($country)){
$log[$lines] = $_;
$lines++;

27
html/cgi-bin/netexternal.cgi
View File

@@ -25,9 +25,12 @@ use strict;
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
use IO::Socket;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/geoip-functions.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
@@ -98,6 +101,12 @@ if ( $querry[0] ne~ ""){
<th align="center">
<strong>$Lang::tr{'nameserver'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'country'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'rdns'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'status'}</strong>
</th>
@@ -139,9 +148,25 @@ END
my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
# collect more information about name server (rDNS, GeoIP country code)
my $ccode = &GeoIP::lookup($nameserver);
my $flag_icon = &GeoIP::get_flag_icon($ccode);
my $iaddr = inet_aton($nameserver);
my $rdns = gethostbyaddr($iaddr, AF_INET);
if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
print <<END;
<tr bgcolor="$table_colour">
<td>$nameserver</td>
<td>
$nameserver
</td>
<td align="center">
<a href='country.cgi#$ccode'><img src="$flag_icon" border="0" alt="$ccode" title="$ccode" /></a>
</td>
<td align="center">
$rdns
</td>
<td bgcolor="$bgcolour" align="center">
<font color="$colour"><strong>$message</strong></font>
</td>

2
html/cgi-bin/netother.cgi
View File

@@ -67,7 +67,7 @@ if ( $querry[0] =~ "fwhits"){
&Header::closebox();
}
&Header::openbox('100%', 'center', "Firewall Hits $Lang::tr{'graph'}");
&Header::openbox('100%', 'center', "$Lang::tr{'firewallhits'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("netother.cgi","fwhits","day");
&Header::closebox();

2
html/cgi-bin/routing.cgi
View File

@@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
last;
}
#Is the network part of an internal network?
$errormessage .= &General::check_net_internal($settings{'IP'});
$errormessage .= &General::check_net_internal_exact($settings{'IP'});
last;
}

2
html/cgi-bin/tor.cgi
View File

@@ -106,7 +106,7 @@ if (&Header::blue_used()) {
}
$settings{'TOR_RELAY_ENABLED'} = 'off';
$settings{'TOR_RELAY_MODE'} = 'exit';
$settings{'TOR_RELAY_MODE'} = 'relay';
$settings{'TOR_RELAY_ADDRESS'} = '';
$settings{'TOR_RELAY_PORT'} = 9001;
$settings{'TOR_RELAY_DIRPORT'} = 0;

2
html/cgi-bin/vpnmain.cgi
View File

@@ -1904,7 +1904,7 @@ END
$cgiparams{'ESP_INTEGRITY'} = 'sha2_512|sha2_256'; #[22];
$cgiparams{'ESP_GROUPTYPE'} = 'curve25519|4096|3072|2048'; #[23];
$cgiparams{'ESP_KEYLIFE'} = '1'; #[17];
$cgiparams{'COMPRESSION'} = 'on'; #[13];
$cgiparams{'COMPRESSION'} = 'off'; #[13];
$cgiparams{'ONLY_PROPOSED'} = 'on'; #[24];
$cgiparams{'PFS'} = 'on'; #[28];
}

2
html/html/themes/darkdos/include/functions.pl
View File

@@ -227,7 +227,7 @@ END
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
}
print <<END
<h2>+ $h2 +</h2>

2
html/html/themes/ipfire-legacy/include/functions.pl
View File

@@ -227,7 +227,7 @@ END
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
}
print <<END
<h2>$h2</h2>

6
html/html/themes/ipfire/include/functions.pl
View File

@@ -152,7 +152,7 @@ print <<END
<body>
<div id="header" class="fixed">
<div id="logo">
<a href="http://www.ipfire.org" style="text-decoration: none;">
<a href="https://www.ipfire.org" style="text-decoration: none;">
<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
END
;
@@ -205,8 +205,8 @@ print <<END;
<div id="footer" class='bigbox fixed'>
<span class="pull-right">
<a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
<a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
<a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
<a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
</span>
<strong>$system_release</strong>

2
html/html/themes/maniac/include/functions.pl
View File

@@ -227,7 +227,7 @@ END
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />";
} else {
print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
}
print <<END
<h2>+ $h2 +</h2>

12
langs/de/cgi-bin/de.pl
View File

@@ -1,6 +1,7 @@
%tr = (
%tr,
'24 hours' => '24 Stunden',
'Act as' => 'Konfiguriert als:',
'Add Level7 rule' => 'Level7-Regel hinzufügen',
'Add Port Rule' => 'Port-Regel hinzufügen',
@@ -1403,6 +1404,7 @@
'invalid loaded file' => 'Ungültige geladene Datei',
'invalid local-remote id' => 'Local-Id und Remote-Id dürfen nicht gleich sein, und müssen einem "@"-Zeichen beginnen. Dies sind leftid und rightid in der StrongSwan-Terminologie.',
'invalid logserver address' => 'Ungültige syslogd-Server-Adresse',
'invalid logserver protocol' => 'Ungültiges syslogd-Server-Übertragungsprotokoll',
'invalid mac address' => 'Ungültige MAC-Adresse',
'invalid max lease time' => 'Ungültige max. Haltezeit.',
'invalid maximum incoming size' => 'Ungültige max. ankommende Größe.',
@@ -1489,7 +1491,8 @@
'log enabled' => 'Protokoll aktiviert',
'log level' => 'Protokollierungslevel',
'log lines per page' => 'Zeilen pro Seite',
'log server address' => 'Syslog Server',
'log server address' => 'Syslog Server:',
'log server protocol' => 'Übertragungsprotokoll:',
'log settings' => 'Protokolldatei-Einstellungen',
'log summaries' => 'Protokollübersicht',
'log summary' => 'Protokollzusammenfassung',
@@ -1724,6 +1727,9 @@
'ok' => 'OK',
'older' => 'Älter',
'on' => 'on',
'one hour' => 'Eine Stunde',
'one month' => 'Ein Monat',
'one week' => 'Eine Woche',
'one year' => 'Ein Jahr',
'online help en' => 'Online-Hilfe (auf Deutsch)',
'only digits allowed in holdoff field' => 'Im Holdoff-Feld sind nur Ziffern erlaubt',
@@ -1959,6 +1965,7 @@
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM-Speicher',
'random number generator daemon' => 'Random Number Generator Daemon',
'rdns' => 'rDNS',
'read bytes' => 'Gelesene Bytes',
'read list' => 'Liste der Leseberechtigten',
'real address' => 'Reale Addresse',
@@ -2196,6 +2203,7 @@
'system logs' => 'Systemprotokolldateien',
'system status information' => 'System-Statusinformationen',
'ta key' => 'TLS-Authentifizierungsschlüssel',
'tcp more reliable' => 'TCP (zuverlässiger)',
'telephone not set' => 'Telefonnummer nicht angegeben.',
'template' => 'Vorlage',
'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Entweder Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.',
@@ -2318,6 +2326,7 @@
'twelve hours' => '12 Stunden',
'two weeks' => 'Zwei Wochen',
'type' => 'Typ',
'udp less overhead' => 'UDP (geringerer Overhead)',
'umount' => 'Abmelden',
'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden',
'unable to alter profiles while red is active' => 'Profile können nicht geändert werden, solange ROT aktiv ist.',
@@ -2332,6 +2341,7 @@
'unix password sync' => 'Unix Password Sync',
'unix shell' => 'UNIX-Shell',
'unknown' => 'Unbekannt',
'unlimited' => 'Unlimitiert',
'unnamed' => 'Unbenannt',
'update' => 'Aktualisieren',
'update accelerator' => 'Update-Accelerator',

5
langs/en/cgi-bin/en.pl
View File

@@ -1435,6 +1435,7 @@
'invalid loaded file' => 'Invalid loaded file',
'invalid local-remote id' => 'local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology.',
'invalid logserver address' => 'Invalid syslogd server address',
'invalid logserver protocol' => 'Invalid syslogd server protocol',
'invalid mac address' => 'Invalid MAC address',
'invalid max lease time' => 'Invalid max lease time.',
'invalid maximum incoming size' => 'Invalid maximum incoming size.',
@@ -1522,6 +1523,7 @@
'log level' => 'Log Level',
'log lines per page' => 'Lines per page',
'log server address' => 'Syslog server:',
'log server protocol' => 'protocol:',
'log settings' => 'Log Settings',
'log summaries' => 'Log summaries',
'log summary' => 'Log Summary',
@@ -1997,6 +1999,7 @@
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM',
'random number generator daemon' => 'Random Number Generator Daemon',
'rdns' => 'rDNS',
'read bytes' => 'Read Bytes',
'read list' => 'list with readonly hosts',
'real address' => 'Real Address',
@@ -2238,6 +2241,7 @@
'system logs' => 'System Logs',
'system status information' => 'System Status Information',
'ta key' => 'TLS-Authentification-Key',
'tcp more reliable' => 'TCP (more reliable)',
'telephone not set' => 'Telephone not set.',
'template' => 'Preset',
'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.',
@@ -2363,6 +2367,7 @@
'twelve hours' => '12 Hours',
'two weeks' => 'Two Weeks',
'type' => 'Type',
'udp less overhead' => 'UDP (less overhead)',
'umount' => 'Umount',
'umount removable media before to unplug' => 'Umount removable media before unplugging the device',
'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.',

5
lfs/Config
View File

@@ -31,7 +31,7 @@
###############################################################################
# Cleanup environment from any variables
unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN
unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
ifeq "$(BUILD_ARCH)" "aarch64"
IS_64BIT = 1
@@ -80,7 +80,7 @@ CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' '
#
define FIND_FILES
cd $(ROOT)/ && find -mount \
\( -path './tools' -or -path './tmp' -or -path './usr/src' \
\( -path '.$(TOOLS_DIR)' -or -path './tmp' -or -path './usr/src' \
-or -path './run' -or -path './dev' -or -path './proc' \
-or -path './install' \) -prune -or -print | sort
endef
@@ -175,7 +175,6 @@ define MD5
# error mean file signature don't match the one in lfs script
[ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
echo "$@ checksum OK"
echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log
endef
define PAK

4
lfs/automake
View File

@@ -32,13 +32,13 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
PREFIX = /usr
TARGET = $(DIR_INFO)/$(THISAPP)
else
PREFIX = /tools
PREFIX = $(TOOLS_DIR)
TARGET = $(DIR_INFO)/$(THISAPP)-tools
endif

8
lfs/bash
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +39,7 @@ ifeq "$(ROOT)" ""
--with-installed-readline
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
CONFIGURE_OPTIONS = --prefix=/tools
CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
endif
CONFIGURE_OPTIONS += \
@@ -100,10 +100,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
ifeq "$(TOOLCHAIN)" "1"
ln -svf bash /tools/bin/sh
ln -svf bash $(TOOLS_DIR)/bin/sh
mkdir -pv $(ROOT)/bin
ln -svf ../tools/bin/bash $(ROOT)/bin/sh
ln -svf ..$(TOOLS_DIR)/bin/bash $(ROOT)/bin/sh
else
ln -svf bash /bin/sh
endif

12
lfs/binutils
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -53,9 +53,9 @@ ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
--target=$(CROSSTARGET) \
--prefix=/tools \
--prefix=$(TOOLS_DIR) \
--with-sysroot=$(ROOT) \
--with-lib-path=/tools/lib
--with-lib-path=$(TOOLS_DIR)/lib
EXTRA_MAKE =
EXTRA_INSTALL =
else
@@ -67,8 +67,8 @@ else
EXTRA_CONFIG = \
--host=$(BUILDTARGET) \
--build=$(BUILDTARGET) \
--prefix=/tools \
--with-lib-path=/tools/lib
--prefix=$(TOOLS_DIR) \
--with-lib-path=$(TOOLS_DIR)/lib
EXTRA_MAKE =
EXTRA_INSTALL =
endif
@@ -138,7 +138,7 @@ ifeq "$(TOOLCHAIN)" "1"
ifeq "$(PASS)" "2"
cd $(DIR_SRC)/binutils-build && make -C ld clean
cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new $(TOOLS_DIR)/bin
endif
endif

6
lfs/boost
View File

@@ -55,8 +55,6 @@ CONFIGURE_OPTIONS = \
cflags="$(CFLAGS)" \
cxxflags="$(CXXFLAGS)"
MAKETUNING = -j2
###############################################################################
# Top-level Rules
###############################################################################
@@ -97,8 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./bootstrap.sh --with-toolset=gcc
cd $(DIR_APP) && ./b2 -d+2 -q $(MAKETUNING) $(CONFIGURE_OPTIONS) stage
cd $(DIR_APP) && ./b2 $(MAKETUNING) $(CONFIGURE_OPTIONS) install
cd $(DIR_APP) && ./b2 -d+2 -q $(CONFIGURE_OPTIONS) stage
cd $(DIR_APP) && ./b2 $(CONFIGURE_OPTIONS) install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/bzip2
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -90,7 +90,7 @@ ifeq "$(ROOT)" ""
ln -sfv bzip2 /bin/bzcat
else
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=/tools install
cd $(DIR_APP) && make PREFIX=$(TOOLS_DIR) install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/ca-certificates
View File

@@ -24,7 +24,7 @@
include Config
VER = 20150710
VER = 20171112
THISAPP = ca-certificates
DIR_APP = $(DIR_SRC)/$(THISAPP)

28
lfs/ccache
View File

@@ -79,28 +79,28 @@ $(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=/tools
cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR)
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
ifeq "$(TOOLCHAIN)" "1"
ifeq "$(PASS)" "1"
mkdir -pv /tools/ccache/bin
ln -svf ../../bin/ccache /tools/ccache/bin/gcc
ln -svf ../../bin/ccache /tools/ccache/bin/g++
ln -svf ../../bin/ccache /tools/ccache/bin/cc
ln -svf ../../bin/ccache /tools/ccache/bin/c++
ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-gcc
ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-g++
ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-cc
ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-c++
mkdir -pv $(TOOLS_DIR)/ccache/bin
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/gcc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/g++
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/cc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/c++
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-gcc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-g++
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-cc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(CROSSTARGET)-c++
endif
ifeq "$(PASS)" "2"
ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-gcc
ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-g++
ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-cc
ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-c++
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-gcc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-g++
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-cc
ln -svf ../../bin/ccache $(TOOLS_DIR)/ccache/bin/$(BUILDTARGET)-c++
endif
endif

22
lfs/cleanup-toolchain
View File

@@ -59,30 +59,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(TOOLCHAIN)" "1"
# Remove the first cross compiler which is not needed anymore.
find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
find $(TOOLS_DIR)/ -name "$(CROSSTARGET)*" | xargs rm -rfv
# Remove man and info pages.
rm -rfv /tools/{,share}/{info,man}
rm -rfv $(TOOLS_DIR)/{,share}/{info,man}
# Strip all binaries.
STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper /tools/
STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper $(TOOLS_DIR)/
# Fix ownership of the toolchain.
chown -R root:root /tools/
chown -R root:root $(TOOLS_DIR)/
# Update/create linker cache.
/tools/sbin/ldconfig
$(TOOLS_DIR)/sbin/ldconfig
# Set a marker when the toolchain was successfully built
touch /tools/.toolchain-successful
touch $(TOOLS_DIR)/.toolchain-successful
else
mv -v /tools/bin/{ld,ld-old}
mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
mv -v /tools/bin/{ld-new,ld}
ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
mv -v $(TOOLS_DIR)/bin/{ld,ld-old}
mv -v $(TOOLS_DIR)/$(BUILDTARGET)/bin/{ld,ld-old}
mv -v $(TOOLS_DIR)/bin/{ld-new,ld}
ln -sv $(TOOLS_DIR)/bin/ld $(TOOLS_DIR)/$(BUILDTARGET)/bin/ld
gcc -dumpspecs | sed \
-e 's@/tools@@g' \
-e 's@$(TOOLS_DIR)@@g' \
-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
-e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
$$(dirname $$(gcc -print-libgcc-file-name))/specs

4
lfs/coreutils
View File

@@ -31,14 +31,14 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
CONFIGURE_OPTIONS = --prefix=/usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
CONFIGURE_OPTIONS = --prefix=/tools
CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
endif
CONFIGURE_OPTIONS += \

2
lfs/dejagnu
View File

@@ -70,7 +70,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=/tools --disable-nls
cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --disable-nls
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/diffutils
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif

6
lfs/expect
View File

@@ -71,10 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
--prefix=/tools \
--prefix=$(TOOLS_DIR) \
--build=$(BUILDTARGET) \
--with-tcl=/tools/lib \
--with-tclinclude=/tools/include \
--with-tcl=$(TOOLS_DIR)/lib \
--with-tclinclude=$(TOOLS_DIR)/include \
--with-x=no \
--disable-nls
cd $(DIR_APP) && make $(MAKETUNING)

2
lfs/fake-environ
View File

@@ -52,7 +52,7 @@ $(TARGET) :
cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP)
cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \
TOOLS_DIR="/tools"
TOOLS_DIR="$(TOOLS_DIR)"
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/findutils
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif

2
lfs/flex
View File

@@ -70,7 +70,7 @@ $(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) && HELP2MAN=/tools/bin/true \
cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install

4
lfs/gawk
View File

@@ -32,13 +32,13 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib --disable-nls
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
endif
###############################################################################

34
lfs/gcc
View File

@@ -50,7 +50,7 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
FULL_BOOTSTRAP = 1
endif
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -71,10 +71,10 @@ ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
--target=$(CROSSTARGET) \
--prefix=/tools \
--prefix=$(TOOLS_DIR) \
--with-sysroot=$(ROOT) \
--with-local-prefix=/tools \
--with-native-system-header-dir=/tools/include \
--with-local-prefix=$(TOOLS_DIR) \
--with-native-system-header-dir=$(TOOLS_DIR)/include \
--disable-nls \
--disable-shared \
--disable-decimal-float \
@@ -107,9 +107,9 @@ ifeq "$(PASS)" "2"
RANLIB="$(CROSSTARGET)-ranlib"
EXTRA_CONFIG = \
--build=$(BUILDTARGET) \
--prefix=/tools \
--with-local-prefix=/tools \
--with-native-system-header-dir=/tools/include \
--prefix=$(TOOLS_DIR) \
--with-local-prefix=$(TOOLS_DIR) \
--with-native-system-header-dir=$(TOOLS_DIR)/include \
--enable-languages=c,c++ \
--disable-libstdcxx-pch \
--disable-libgomp
@@ -130,13 +130,13 @@ else
RANLIB="$(CROSSTARGET)-ranlib"
EXTRA_CONFIG = \
--host=$(CROSSTARGET) \
--prefix=/tools \
--prefix=$(TOOLS_DIR) \
--with-sysroot=$(ROOT) \
--disable-shared \
--disable-nls \
--disable-libstdcxx-threads \
--disable-libstdcxx-pch \
--with-gxx-include-dir=/tools/$(CROSSTARGET)/include/c++/$(VER)
--with-gxx-include-dir=$(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
@@ -234,18 +234,18 @@ ifeq "$(TOOLCHAIN)" "1"
ifeq "$(PASS)" "2"
cd $(DIR_APP) && cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
`dirname $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include-fixed/limits.h
`dirname $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include-fixed/limits.h
endif
for file in $$(find $(DIR_APP)/gcc/config -name linux64.h -o -name linux.h \
-o -name sysv4.h -o -name linux-eabi.h -o -name linux-elf.h -o -name aarch64-linux.h); do \
echo "Processing $${file}..."; \
sed -i $${file} \
-e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
-e 's@/usr@/tools@g'; \
-e 's@/lib\(64\)\?\(32\)\?/ld@$(TOOLS_DIR)&@g' \
-e 's@/usr@$(TOOLS_DIR)@g'; \
echo '#undef STANDARD_STARTFILE_PREFIX_1' >> $${file}; \
echo '#undef STANDARD_STARTFILE_PREFIX_2' >> $${file}; \
echo '#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"' >> $${file}; \
echo '#define STANDARD_STARTFILE_PREFIX_1 "$(TOOLS_DIR)/lib/"' >> $${file}; \
echo '#define STANDARD_STARTFILE_PREFIX_2 ""' >> $${file}; \
done
endif
@@ -271,18 +271,18 @@ endif
ifeq "$(TOOLCHAIN)" "1"
ifeq "$(PASS)" "1"
ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
ln -svf libgcc.a $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
endif
ifeq "$(PASS)" "2"
ln -svf gcc /tools/bin/cc
ln -svf gcc $(TOOLS_DIR)/bin/cc
# remove gdb python files from libdir
rm -rf /tools/lib/*-gdb.py
rm -rf $(TOOLS_DIR)/lib/*-gdb.py
endif
ifeq "$(PASS)" "L"
# Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70936
sed -e "s/^#include_next/#include/" -i /tools/$(CROSSTARGET)/include/c++/$(VER)/cstdlib
sed -e "s/^#include_next/#include/" -i $(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER)/cstdlib
endif
else # NON-TOOLCHAIN

6
lfs/gettext
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls --build=$(BUILDTARGET)
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-shared --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
@@ -92,7 +92,7 @@ else
cd $(DIR_APP)/gettext-tools && make -C gnulib-lib
cd $(DIR_APP)/gettext-tools && make -C intl pluralx.c
cd $(DIR_APP)/gettext-tools && make -C src msgfmt
cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /tools/bin
cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt $(TOOLS_DIR)/bin
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

10
lfs/glibc
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -45,8 +45,8 @@ else
EXTRA_CONFIG = \
--host=$(CROSSTARGET) \
--build=$(BUILDTARGET) \
--prefix=/tools \
--with-headers=/tools/include \
--prefix=$(TOOLS_DIR) \
--with-headers=$(TOOLS_DIR)/include \
libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes
endif
@@ -160,8 +160,8 @@ ifeq "$(TOOLCHAIN)" "1"
cd $(DIR_APP) && echo "int main() { return 0; }" > dummy.c
cd $(DIR_APP) && $(CROSSTARGET)-gcc dummy.c -o dummy
# Must be using a runtime linker from /tools
cd $(DIR_APP) && readelf -l dummy | grep "Requesting program interpreter: /tools"
# Must be using a runtime linker from $(TOOLS_DIR)
cd $(DIR_APP) && readelf -l dummy | grep "Requesting program interpreter: $(TOOLS_DIR)"
cd $(DIR_APP) && rm -vf dummy dummy.c
endif

4
lfs/grep
View File

@@ -31,14 +31,14 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls \
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls \
--disable-perl-regexp --without-included-regex
endif

4
lfs/gzip
View File

@@ -31,14 +31,14 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
endif
###############################################################################

2
lfs/linux
View File

@@ -55,7 +55,7 @@ VERSUFIX=ipfire$(KCFG)
ifeq "$(TOOLCHAIN)" "1"
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
HEADERS_PREFIX = /tools
HEADERS_PREFIX = $(TOOLS_DIR)
else
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
HEADERS_PREFIX = /usr

4
lfs/m4
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +39,7 @@ ifeq "$(ROOT)" ""
EXTRA_MAKE =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
EXTRA_MAKE =
endif

4
lfs/make
View File

@@ -35,7 +35,7 @@ PAK_VER = 4
DEPS = ""
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -44,7 +44,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
endif

6
lfs/ncurses
View File

@@ -31,14 +31,14 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
PREFIX = $(TOOLS_DIR)
EXTRA_CONFIG = --build=$(BUILDTARGET)
endif
@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
# Create pkgconfig dir in toolchain
ifneq "$(ROOT)" ""
mkdir -pv /tools/lib/pkgconfig/
mkdir -pv $(TOOLS_DIR)/lib/pkgconfig/
endif
cd $(DIR_APP) && CPPFLAGS=-P ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)

4
lfs/ncurses-compat
View File

@@ -31,14 +31,14 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
PREFIX = $(TOOLS_DIR)
endif
EXTRA_CONFIG += \

4
lfs/patch
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
endif

10
lfs/perl
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -90,13 +90,13 @@ ifeq "$(ROOT)" ""
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO'
cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO'
cd $(DIR_APP) && sed -i 's/^0$$//' makefile
cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
cd $(DIR_APP) && make perl utilities
cd $(DIR_APP) && cp -v perl pod/pod2man /tools/bin
cd $(DIR_APP) && mkdir -pv /tools/lib/perl5/$(VER)
cd $(DIR_APP) && cp -Rv lib/* /tools/lib/perl5/$(VER)
cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin
cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER)
cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER)
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/pkg-config
View File

@@ -32,14 +32,14 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
PREFIX = $(TOOLS_DIR)
endif
###############################################################################
@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(ROOT)" ""
else
mkdir -pv /tools/lib/pkgconfig
mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
endif
cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
cd $(DIR_APP) && make $(MAKETUNING)

95
lfs/pound
View File

@@ -1,95 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# 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 = 2.7
THISAPP = Pound-$(VER)
DL_FILE = $(THISAPP).tgz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pound
PAK_VER = 8
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ec8298aa3e4aee3ffbecdc0639d7f14a
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) && ./configure --prefix=/usr --sysconfdir=/etc \
--with-dh=1024
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
#install initscripts
$(call INSTALL_INITSCRIPT,pound)
install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
/var/ipfire/backup/addons/includes/pound
# Remove temporary file.
rm -vf /root/.rnd
@rm -rf $(DIR_APP)
@$(POSTBUILD)

9
lfs/samba
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 67
PAK_VER = 68
DEPS = "cups krb5"
@@ -152,9 +152,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.99-fix_member_auth_after_changed_secret.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.99-fix_dirsort_ea-support.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-7494-v3-6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.99-winbind_fix_trusted_domain_handling.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-2619.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-12150-v3-6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-12163.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-15275.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/doc-update.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.x-winbind_tevent_poll.patch
cd $(DIR_APP)/source3 && ./autogen.sh
cd $(DIR_APP)/source3 && ./configure \

4
lfs/sed
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ ifeq "$(ROOT)" ""
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
endif

52
lfs/sources-iso
View File

@@ -1,52 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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
THISAPP = sources-iso
###############################################################################
# Top-level Rules
###############################################################################
check :
download :
md5 :
###############################################################################
# Installation Details
###############################################################################
install : $(DIR_INFO)/_build.othersrc-list.log
rm -rf /install/cdrom/*
for i in `cat $(DIR_INFO)/_build.othersrc-list.log`; do \
cp $(DIR_DL)/$$i /install/cdrom; \
done
# make the sources CDROM iso
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
. > /install/images/$(SNAME)-sources-cd-$(VERSION).$(BUILD_ARCH).iso
rm -rf /install/cdrom/*

83
lfs/sslscan
View File

@@ -1,83 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# 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 = 1.10.2
THISAPP = sslscan-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = sslscan
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 41ecff92303cecfd00bf3c7de509af14
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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
cd $(DIR_APP) && make install PREFIX=/usr
@rm -rf $(DIR_APP)
@$(POSTBUILD)

Some files were not shown because too many files have changed in this diff Show More