Development June 2017

development@lists.ipfire.org

9 participants
62 discussions

Problems with the current IPFire Build
by Wolfgang Apolinarski 01 Jul '17

01 Jul '17

Hi, continuing on my series of problems with the current next build, I currently have the following problems: - unbound (well, you already know about the problem of the name resolution) - segfaulting hwclock on /usr/local/bin/settime and during startup (S60setclock) and shutdown (K47setclock) - grsec: denied resource overstep by requesting 4096 for RLIMIT_CORE against limit 0 for /sbin/hwclock - "error: no symbol table. (...) Press any key to continue..." before the kernel is loaded, right after grub. - even when no key is pressed, the boot continues Sorry that I bother you only with problems this time, but I want to make sure that this "normal" for the current next, before I rebase and re-sent the apache patches. Best regards, Wolfgang PS.: I also can have a look at some of these issues, just not today and I wanted to make sure that these issues are not only because of VirtualBox.

2 1

Unbound - rootfile
by Wolfgang Apolinarski 29 Jun '17

29 Jun '17

Hi everyone, while trying to create a nice patch for the next patch-merge-window, I was encountering an error that preventing the proper execution of "./make.sh build". Apparently the unbound update did not get a rootfile update. After changing it, it worked fine (patch, see below). Nevertheless, I still get warnings about the rootfiles of kbd, unbound and cmake (and no, my patch does not change them). Best regards, Wolfgang PS.: I'm currently testing everything on a fresh install of CentOS, to mitigate side-effects from previous builds. PPS.: You are not using a build server system of some kind, right? --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.2 -usr/lib/libunbound.so.2.5.1 +usr/lib/libunbound.so.2.5.2 usr/sbin/unbound usr/sbin/unbound-anchor usr/sbin/unbound-checkconf

3 3

[PATCH] Cleanup2017: Remove function IPInSubnet
by Alexander Marx 29 Jun '17

29 Jun '17

In order to cleanup code, the old function IpInSubnet is deleted from general-functions. In the future only network functions from network-functions.pl should be used. So this commit deletes the IpInSubnet and replaces it with the ip_address_in_network from the new network-functions.pl Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- config/cfgroot/general-functions.pl | 32 ++++++++++++-------------------- config/firewall/convert-dmz | 8 ++++---- config/firewall/convert-outgoingfw | 6 +++--- config/firewall/firewall-lib.pl | 6 +++--- html/cgi-bin/dhcp.cgi | 22 ++++++---------------- html/cgi-bin/firewall.cgi | 29 ++++++++++++++--------------- html/cgi-bin/fwhosts.cgi | 17 ++++++++--------- html/cgi-bin/ovpnmain.cgi | 33 ++++++++++++++------------------- html/cgi-bin/wireless.cgi | 4 +--- 9 files changed, 65 insertions(+), 92 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f448c34..4a0b56f 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -487,7 +487,7 @@ sub checksubnets foreach my $key (keys %ovpnconfhash) { if ($ovpnconfhash{$key}[3] eq 'net'){ my @ovpnnet=split (/\//,$ovpnconfhash{$key}[11]); - if (&IpInSubnet($ip,$ovpnnet[0],&iporsubtodec($ovpnnet[1]))){ + if (&Network::ip_address_in_network($ip,$ovpnnet[0]."/".&iporsubtodec($ovpnnet[1]))){ $errormessage=$errormessage.$Lang::tr{'ccd err isovpnn2n'}." $ovpnconfhash{$key}[1] "; return $errormessage; } @@ -505,7 +505,7 @@ sub checksubnets return $errormessage; } my ($newip,$newsub) = split(/\//,$ccdnet); - if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) + if (&Network::ip_address_in_network($newip,$ccdconf[0]."/".&iporsubtodec($ccdconf[1]))) { $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}." $ccdconfhash{$key}[0] "; return $errormessage; @@ -521,7 +521,7 @@ sub checksubnets my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); $ipsecsub=&iporsubtodec($ipsecsub); if($ipsecconf{$key}[1] ne $ccdname){ - if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ + if (&Network::ip_address_in_network($ip,$ipsecip."/".$ipsecsub)){ $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]"; return $errormessage; } @@ -535,7 +535,7 @@ sub checksubnets &readhash("${General::swroot}/vpn/settings", \%vpnconf); if ($vpnconf{'RW_NET'} ne ''){ my ($ipsecrwnet,$ipsecrwsub)=split (/\//, $vpnconf{'RW_NET'}); - if (&IpInSubnet($ip,$ipsecrwnet,&iporsubtodec($ipsecrwsub))) + if (&Network::ip_address_in_network($ip,$ipsecrwnet."/".&iporsubtodec($ipsecrwsub))) { $errormessage=$errormessage.$Lang::tr{'ccd err isipsecrw'}." "; return $errormessage; @@ -559,10 +559,10 @@ sub check_net_internal_range{ $cidr=&iporsubtocidr($cidr); #check if we use one of ipfire's networks (green,orange,blue) &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ip,$ownnet{'GREEN_NETADDRESS'}."/".&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ip,$ownnet{'ORANGE_NETADDRESS'}."/".&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ip,$ownnet{'BLUE_NETADDRESS'}."/".&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ip,$ownnet{'RED_NETADDRESS'}."/".&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} } sub check_net_internal_exact{ @@ -727,14 +727,6 @@ sub validportrange # used to check a port range } } -sub IpInSubnet { - my $addr = shift; - my $network = shift; - my $netmask = shift; - - return &Network::ip_address_in_network($addr, "$network/$netmask"); -} - # # Return the following IP (IP+1) in dotted notation. # Call: NextIP ('1.1.1.1'); @@ -985,10 +977,10 @@ sub GetDyndnsRedIP { chomp $ip; # 100.64.0.0/10 is reserved for dual-stack lite (http://tools.ietf.org/html/rfc6598). - if (&General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') || - &General::IpInSubnet ($ip,'172.16.0.0.','255.240.0.0') || - &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0') || - &General::IpInSubnet ($ip,'100.64.0.0', '255.192.0.0')) + if (&Network::ip_address_in_network($ip,'10.0.0.0/255.0.0.0') || + &Network::ip_address_in_network($ip,'172.16.0.0/255.240.0.0') || + &Network::ip_address_in_network($ip,'192.168.0.0/255.255.0.0') || + &Network::ip_address_in_network($ip,'100.64.0.0/255.192.0.0')) { if ($settings{'BEHINDROUTER'} eq 'FETCH_IP') { my $RealIP = &General::FetchPublicIp; diff --git a/config/firewall/convert-dmz b/config/firewall/convert-dmz index 7b77045..11bd405 100755 --- a/config/firewall/convert-dmz +++ b/config/firewall/convert-dmz @@ -95,10 +95,10 @@ sub process_rules{ }elsif($f eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){ $field3='std_net_src'; $field4='BLUE'; - }elsif($f eq 'orange' && &General::IpInSubnet($ip,$ifaces{'ORANGE_NETADDRESS'},$ifaces{'ORANGE_NETMASK'})){ + }elsif($f eq 'orange' && &Network::ip_address_in_network($ip,$ifaces{'ORANGE_NETADDRESS'}."/".$ifaces{'ORANGE_NETMASK'})){ $field3='src_addr'; $field4=$b; - }elsif($f eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){ + }elsif($f eq 'blue' && &Network::ip_address_in_network($ip,$ifaces{'BLUE_NETADDRESS'}."/".$ifaces{'BLUE_NETMASK'})){ $field3='src_addr'; $field4=$b; }else{ @@ -121,10 +121,10 @@ sub process_rules{ }elsif($g eq 'blue' && $ip eq $ifaces{'BLUE_NETADDRESS'}){ $field5='std_net_tgt'; $field6='BLUE'; - }elsif($g eq 'green' && &General::IpInSubnet($ip,$ifaces{'GREEN_NETADDRESS'},$ifaces{'GREEN_NETMASK'})){ + }elsif($g eq 'green' && &Network::ip_address_in_network($ip,$ifaces{'GREEN_NETADDRESS'}."/".$ifaces{'GREEN_NETMASK'})){ $field5='tgt_addr'; $field6=$c; - }elsif($g eq 'blue' && &General::IpInSubnet($ip,$ifaces{'BLUE_NETADDRESS'},$ifaces{'BLUE_NETMASK'})){ + }elsif($g eq 'blue' && &Network::ip_address_in_network($ip,$ifaces{'BLUE_NETADDRESS'}."/".$ifaces{'BLUE_NETMASK'})){ $field5='tgt_addr'; $field6=$c; }else{ diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw index c917f84..553df50 100755 --- a/config/firewall/convert-outgoingfw +++ b/config/firewall/convert-outgoingfw @@ -221,15 +221,15 @@ sub new_hostgrp print LOG "Processing NETWORK $ippart/$subnet from Group $grp\n"; if(!&check_net($ippart,$subnet)){ #Check if this network is one one of IPFire internal networks - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'GREEN_NETADDRESS'},$ownnet{'GREEN_NETMASK'})) + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ippart,$ownnet{'GREEN_NETADDRESS'}."/".$ownnet{'GREEN_NETMASK'})) { $name2='GREEN'; $name3='Standard Network'; - }elsif (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'ORANGE_NETADDRESS'},$ownnet{'ORANGE_NETMASK'})) + }elsif (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ippart,$ownnet{'ORANGE_NETADDRESS'}."/".$ownnet{'ORANGE_NETMASK'})) { $name2='ORANGE'; $name3='Standard Network'; - }elsif (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ippart,$ownnet{'BLUE_NETADDRESS'},$ownnet{'BLUE_NETMASK'})) + }elsif (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::ip_address_in_network($ippart,$ownnet{'BLUE_NETADDRESS'}."/".$ownnet{'BLUE_NETMASK'})) { $name2='BLUE'; $name3='Standard Network'; diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl index eabd9a4..6f86a16 100644 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -551,7 +551,7 @@ sub get_matching_firewall_address my $zone_subnet = $netsettings{$zone . "_NETADDRESS"}; my $zone_mask = $netsettings{$zone . "_NETMASK"}; - if (&General::IpInSubnet($address, $zone_subnet, $zone_mask)) { + if (&Network::ip_address_in_network($address,$zone_subnet."/".$zone_mask)){ return $netsettings{$zone . "_ADDRESS"}; } } @@ -568,12 +568,12 @@ sub get_internal_firewall_ip_address return 0; } - # Convert net mask into correct format for &General::IpInSubnet(). + # Convert net mask into correct format for &Network::ip_address_in_network(). $net_mask = &General::iporsubtodec($net_mask); my @addresses = &get_internal_firewall_ip_addresses($use_orange); foreach my $zone_address (@addresses) { - if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) { + if (&Network::ip_address_in_network($zone_address,$net_address."/".$net_mask)){ return $zone_address; } } diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 3eb5349..6bc50d3 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -142,9 +142,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid end address'}; goto ERROR; } - if (! &General::IpInSubnet ( $dhcpsettings{"START_ADDR_${itf}"}, - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { + if (!&Network::ip_address_in_network($dhcpsettings{"START_ADDR_${itf}"},$netsettings{"${itf}_NETADDRESS"}."/".$netsettings{"${itf}_NETMASK"})){ $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid start address'}; goto ERROR; } @@ -159,9 +157,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid start address'}; goto ERROR; } - if (! &General::IpInSubnet ( $dhcpsettings{"END_ADDR_${itf}"}, - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { + if (!&Network::ip_address_in_network($dhcpsettings{"END_ADDR_${itf}"},$netsettings{"${itf}_NETADDRESS"}."/".$netsettings{"${itf}_NETMASK"})){ $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid end address'}; goto ERROR; } @@ -419,15 +415,11 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { # if ip are not inside a known subnet, I don't warn. # Also it may be needed to put duplicate fixed lease in their right subnet definition.. foreach my $itf (@ITFs) { - my $scoped = &General::IpInSubnet($dhcpsettings{'FIX_ADDR'}, - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"}) && - $dhcpsettings{"ENABLE_${itf}"} eq 'on'; + my $scoped = &Network::ip_address_in_network($dhcpsettings{'FIX_ADDR'},$netsettings{"${itf}_NETADDRESS"}."/".$netsettings{"${itf}_NETMASK"}) && + $dhcpsettings{"ENABLE_${itf}"} eq 'on'; if ( $scoped && (lc($dhcpsettings{'FIX_MAC'}) eq lc($temp[0])) && - &General::IpInSubnet($temp[1], - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { + &Network::ip_address_in_network($temp[1],$netsettings{"${itf}_NETADDRESS"}."/".$netsettings{"${itf}_NETMASK"})){ $errormessage = "$Lang::tr{'mac address in use'} $dhcpsettings{'FIX_MAC'}"; last CHECK; } @@ -993,9 +985,7 @@ foreach my $line (@current2) { # Mark IP addresses outwith known subnets $ipoutside{$temp[1]} = 1; foreach my $itf (@ITFs) { - if ( &General::IpInSubnet($temp[1], - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { + if (&Network::ip_address_in_network($temp[1],$netsettings{"${itf}_NETADDRESS"}."/".$netsettings{"${itf}_NETMASK"})){ $ipoutside{$temp[1]} = 0; } } diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index face0f4..0edb648 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -31,7 +31,6 @@ no warnings 'uninitialized'; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; -require '/var/ipfire/network-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "${General::swroot}/geoip-functions.pl"; @@ -237,7 +236,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') #check if manual ip (source) is orange network if ($fwdfwsettings{'grp1'} eq 'src_addr'){ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); - if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + if (&Network::ip_address_in_network($sip,$netsettings{'ORANGE_ADDRESS'}."/".$netsettings{'ORANGE_NETMASK'})){ $checkorange='on'; } } @@ -817,7 +816,7 @@ sub checkrule my $networkip1=&General::getnetworkip($sip,$scidr); my $networkip2=&General::getnetworkip($tip,$tcidr); if ($scidr gt $tcidr){ - if ( &General::IpInSubnet($networkip1,$tip,&General::iporsubtodec($tcidr))){ + if (&Network::ip_address_in_network($networkip1,$tip."/".&General::iporsubtodec($tcidr))){ $errormessage.=$Lang::tr{'fwdfw err samesub'}; } }elsif($scidr eq $tcidr && $scidr eq '32'){ @@ -828,7 +827,7 @@ sub checkrule $hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target: $networkip2/$tcidr "; } }else{ - if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){ + if (&Network::ip_address_in_network($networkip2,$sip."/".&General::iporsubtodec($scidr))){ $errormessage.=$Lang::tr{'fwdfw err samesub'}; } } @@ -919,7 +918,7 @@ sub checkvpn foreach my $key (sort keys %ccdnet){ my ($vpnip,$vpnsubnet) = split ("/",$ccdnet{$key}[1]); my $sub=&General::iporsubtodec($vpnsubnet); - if (&General::IpInSubnet($ip,$vpnip,$sub)){ + if (&Network::ip_address_in_network($ip,$vpnip."/".$sub)){ return 0; } } @@ -1352,15 +1351,15 @@ sub getcolor return; }elsif($val =~ /^(.*?)\/(.*?)$/){ my ($sip,$scidr) = split ("/",$val); - if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + if (&Header::orange_used() && &Network::ip_address_in_network($sip,$netsettings{'ORANGE_ADDRESS'}."/".$netsettings{'ORANGE_NETMASK'})){ $tdcolor="style='background-color: $Header::colourorange;color:white;'"; return; } - if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){ + if (&Network::ip_address_in_network($sip,$netsettings{'GREEN_ADDRESS'}."/".$netsettings{'GREEN_NETMASK'})){ $tdcolor="style='background-color: $Header::colourgreen;color:white;'"; return; } - if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){ + if (&Header::blue_used() && &Network::ip_address_in_network($sip,$netsettings{'BLUE_ADDRESS'}."/".$netsettings{'BLUE_NETMASK'})){ $tdcolor="style='background-color: $Header::colourblue;color:white;'"; return; } @@ -1373,7 +1372,7 @@ sub getcolor #Check if IP is part of OpenVPN dynamic subnet my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'}); my ($c,$d) = split("/",$val); - if (&General::IpInSubnet($c,$a,$b)){ + if (&Network::ip_address_in_network($c,$a."/".$b)){ $tdcolor="style='background-color: $Header::colourovpn;color:white;'"; return; } @@ -1381,7 +1380,7 @@ sub getcolor foreach my $key (sort keys %ccdnet){ my ($a,$b) = split("/",$ccdnet{$key}[1]); $b =&General::iporsubtodec($b); - if (&General::IpInSubnet($c,$a,$b)){ + if (&Network::ip_address_in_network($c,$a."/".$b)){ $tdcolor="style='background-color: $Header::colourovpn;color:white;'"; return; } @@ -1390,7 +1389,7 @@ sub getcolor foreach my $key (sort keys %ccdhost){ if ($ccdhost{$key}[3] eq 'net'){ my ($a,$b) = split("/",$ccdhost{$key}[11]); - if (&General::IpInSubnet($c,$a,$b)){ + if (&Network::ip_address_in_network($c,$a."/".$b)){ $tdcolor="style='background-color: $Header::colourovpn;color:white;'"; return; } @@ -1400,7 +1399,7 @@ sub getcolor if ($ipsecsettings{'RW_NET'} ne ''){ my ($a,$b) = split("/",$ipsecsettings{'RW_NET'}); $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($c,$a,$b)){ + if (&Network::ip_address_in_network($c,$a."/".$b)){ $tdcolor="style='background-color: $Header::colourvpn;color:white;'"; return; } @@ -1410,7 +1409,7 @@ sub getcolor if ($ipsecconf{$key}[11]){ my ($a,$b) = split("/",$ipsecconf{$key}[11]); $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($c,$a,$b)){ + if (&Network::ip_address_in_network($c,$a."/".$b)){ $tdcolor="style='background-color: $Header::colourvpn;color:white;'"; return; } @@ -1587,7 +1586,7 @@ sub newrule #check if manual ip (source) is orange network if ($fwdfwsettings{'grp1'} eq 'src_addr'){ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); - if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + if (&Network::ip_address_in_network($sip,$netsettings{'ORANGE_ADDRESS'}."/".$netsettings{'ORANGE_NETMASK'})){ $fwdfwsettings{'oldorange'} ='on'; } } @@ -1609,7 +1608,7 @@ sub newrule #check if manual ip (source) is orange network if ($fwdfwsettings{'grp1'} eq 'src_addr'){ my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); - if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + if (&Network::ip_address_in_network($sip,$netsettings{'ORANGE_ADDRESS'}."/".$netsettings{'ORANGE_NETMASK'})){ $fwdfwsettings{'oldorange'} ='on'; } } diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index a2ade8a..22d8ef9 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -27,7 +27,6 @@ use Sort::Naturally; use CGI::Carp 'fatalsToBrowser'; no warnings 'uninitialized'; require '/var/ipfire/general-functions.pl'; -require '/var/ipfire/network-functions.pl'; require "/var/ipfire/geoip-functions.pl"; require "/usr/lib/firewall/firewall-lib.pl"; require "${General::swroot}/lang.pl"; @@ -1909,15 +1908,15 @@ sub getcolor } #Now check if IP is part of ORANGE,BLUE or GREEN - if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ + if (&Header::orange_used() && &Network::ip_address_in_network($sip,$netsettings{'ORANGE_ADDRESS'}."/".$netsettings{'ORANGE_NETMASK'})){ $tdcolor="$c"; return $tdcolor; } - if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){ + if (&Network::ip_address_in_network($sip,$netsettings{'GREEN_ADDRESS'}."/".$netsettings{'GREEN_NETMASK'})){ $tdcolor="$c"; return $tdcolor; } - if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){ + if (&Header::blue_used() && &Network::ip_address_in_network($sip,$netsettings{'BLUE_ADDRESS'}."/".$netsettings{'BLUE_NETMASK'})){ $tdcolor="$c"; return $tdcolor; } @@ -1929,7 +1928,7 @@ sub getcolor foreach my $key (sort keys %ccdhost){ if ($ccdhost{$key}[3] eq 'net'){ my ($a,$b) = split("/",$ccdhost{$key}[11]); - if (&General::IpInSubnet($sip,$a,$b)){ + if (&Network::ip_address_in_network($sip,$a."/".$b)){ $tdcolor="$c"; return $tdcolor; } @@ -1938,7 +1937,7 @@ sub getcolor #Check if IP is part of OpenVPN dynamic subnet my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'}); - if (&General::IpInSubnet($sip,$a,$b)){ + if (&Network::ip_address_in_network($sip,$a."/".$b)){ $tdcolor="$c"; return $tdcolor; } @@ -1947,7 +1946,7 @@ sub getcolor foreach my $key (sort keys %ccdnet){ my ($a,$b) = split("/",$ccdnet{$key}[1]); $b =&General::iporsubtodec($b); - if (&General::IpInSubnet($sip,$a,$b)){ + if (&Network::ip_address_in_network($sip,$a."/".$b)){ $tdcolor="$c"; return $tdcolor; } @@ -1957,7 +1956,7 @@ sub getcolor if ($ipsecsettings{'RW_NET'} ne ''){ my ($a,$b) = split("/",$ipsecsettings{'RW_NET'}); $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($sip,$a,$b)){ + if (&Network::ip_address_in_network($sip,$a."/".$b)){ $tdcolor="$c"; return $tdcolor; } @@ -1968,7 +1967,7 @@ sub getcolor if ($ipsecconf{$key}[11]){ my ($a,$b) = split("/",$ipsecconf{$key}[11]); $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($sip,$a,$b)){ + if (&Network::ip_address_in_network($sip,$a."/".$b)){ $tdcolor="$c"; return $tdcolor; } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index d46a14e..476b877 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -579,7 +579,7 @@ sub check_routes_push return 0; } #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,&General::iporsubtodec($cidr2))){ + if (&Network::ip_address_in_network($ip,$ip2."/".&General::iporsubtodec($cidr2))){ return 0; } }; @@ -602,7 +602,7 @@ sub check_ccdroute } my ($ip2,$cidr2) = split (/\//,$ccdroutehash{$key}[$i]); #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,$cidr2)&& $ccdroutehash{$key}[0] ne $cgiparams{'NAME'} ){ + if (&Network::ip_address_in_network($ip,$ip2."/".$cidr2) && $ccdroutehash{$key}[0] ne $cgiparams{'NAME'}){ return 0; } } @@ -622,7 +622,7 @@ sub check_ccdconf } my ($ip2,$cidr2) = split (/\//,$ccdconfhash{$key}[1]); #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,&General::cidrtosub($cidr2))){ + if (&Network::ip_address_in_network($ip,$ip2."/".&General::cidrtosub($cidr2))){ return 0; } @@ -835,7 +835,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { goto ADV_ERROR; } my ($ip2,$cidr2) = split(/\//,$ccdroutehash{$key}[$i]); - if (&General::IpInSubnet ($ip,$ip2,$cidr2)){ + if (&Network::ip_address_in_network($ip,$ip2."/".$cidr2)){ $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; goto ADV_ERROR; } @@ -1113,26 +1113,22 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg } my @tmpovpnsubnet = split("\/",$cgiparams{'DOVPN_SUBNET'}); - if (&General::IpInSubnet ( $netsettings{'RED_ADDRESS'}, - $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { + if (&Network::ip_address_in_network($netsettings{'RED_ADDRESS'},$tmpovpnsubnet[0]."/".$tmpovpnsubnet[1])){ $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire RED Network $netsettings{'RED_ADDRESS'}"; goto SETTINGS_ERROR; } - if (&General::IpInSubnet ( $netsettings{'GREEN_ADDRESS'}, - $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { + if (&Network::ip_address_in_network($netsettings{'GREEN_ADDRESS'},$tmpovpnsubnet[0]."/".$tmpovpnsubnet[1])){ $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Green Network $netsettings{'GREEN_ADDRESS'}"; goto SETTINGS_ERROR; } - if (&General::IpInSubnet ( $netsettings{'BLUE_ADDRESS'}, - $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { + if (&Network::ip_address_in_network($netsettings{'BLUE_ADDRESS'},$tmpovpnsubnet[0]."/".$tmpovpnsubnet[1])){ $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Blue Network $netsettings{'BLUE_ADDRESS'}"; goto SETTINGS_ERROR; } - if (&General::IpInSubnet ( $netsettings{'ORANGE_ADDRESS'}, - $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { + if (&Network::ip_address_in_network($netsettings{'ORANGE_ADDRESS'},$tmpovpnsubnet[0]."/".$tmpovpnsubnet[1])){ $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Orange Network $netsettings{'ORANGE_ADDRESS'}"; goto SETTINGS_ERROR; } @@ -1142,8 +1138,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg chomp($_); my @tempalias = split(/\,/,$_); if ($tempalias[1] eq 'on') { - if (&General::IpInSubnet ($tempalias[0] , - $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { + if (&Network::ip_address_in_network($tempalias[0],$tmpovpnsubnet[0]."/".$tmpovpnsubnet[1])){ $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire alias entry $tempalias[0]"; } } @@ -3651,7 +3646,7 @@ if ($cgiparams{'TYPE'} eq 'host') { my ($ip1,$cidr1) = split (/\//, $val); $ip1 = &General::getnetworkip($ip1,&General::iporsubtocidr($cidr1)); my ($ip2,$cidr2) = split (/\//, $ccdroutehash{$key}[$oldiroute]); - if (&General::IpInSubnet ($ip1,$ip2,$cidr2)){ + if (&Network::ip_address_in_network($ip1,$ip2."/".$cidr2)){ $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; goto VPNCONF_ERROR; } @@ -3670,19 +3665,19 @@ if ($cgiparams{'TYPE'} eq 'host') { } #check for existing network IP's - if (&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0') + if (&Network::ip_address_in_network($ip,$netsettings{GREEN_NETADDRESS}."/".$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0') { $errormessage=$Lang::tr{'ccd err green'}; goto VPNCONF_ERROR; - }elsif(&General::IpInSubnet ($ip,$netsettings{RED_NETADDRESS},$netsettings{RED_NETMASK}) && $netsettings{RED_NETADDRESS} ne '0.0.0.0') + }elsif(&Network::ip_address_in_network($ip,$netsettings{RED_NETADDRESS}."/".$netsettings{RED_NETMASK}) && $netsettings{RED_NETADDRESS} ne '0.0.0.0') { $errormessage=$Lang::tr{'ccd err red'}; goto VPNCONF_ERROR; - }elsif(&General::IpInSubnet ($ip,$netsettings{BLUE_NETADDRESS},$netsettings{BLUE_NETMASK}) && $netsettings{BLUE_NETADDRESS} ne '0.0.0.0' && $netsettings{BLUE_NETADDRESS} gt '') + }elsif(&Network::ip_address_in_network($ip,$netsettings{BLUE_NETADDRESS}."/".$netsettings{BLUE_NETMASK}) && $netsettings{BLUE_NETADDRESS} ne '0.0.0.0' && $netsettings{BLUE_NETADDRESS} gt '') { $errormessage=$Lang::tr{'ccd err blue'}; goto VPNCONF_ERROR; - }elsif(&General::IpInSubnet ($ip,$netsettings{ORANGE_NETADDRESS},$netsettings{ORANGE_NETMASK}) && $netsettings{ORANGE_NETADDRESS} ne '0.0.0.0' && $netsettings{ORANGE_NETADDRESS} gt '' ) + }elsif(&Network::ip_address_in_network($ip,$netsettings{ORANGE_NETADDRESS}."/".$netsettings{ORANGE_NETMASK}) && $netsettings{ORANGE_NETADDRESS} ne '0.0.0.0' && $netsettings{ORANGE_NETADDRESS} gt '' ) { $errormessage=$Lang::tr{'ccd err orange'}; goto VPNCONF_ERROR; diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi index d4592a2..afa8edc 100644 --- a/html/cgi-bin/wireless.cgi +++ b/html/cgi-bin/wireless.cgi @@ -447,9 +447,7 @@ END $hostname =~ s/\"//g; } elsif ($line eq "}") { # Select records in Blue subnet - if ( &General::IpInSubnet ( $ip, - $netsettings{"BLUE_NETADDRESS"}, - $netsettings{"BLUE_NETMASK"} ) ) { + if (&Network::ip_address_in_network($ip,$netsettings{'BLUE_NETADDRESS'}."/".$netsettings{'BLUE_NETMASK'})){ @record = ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$hostname); $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record -- 2.7.4

1 0

[PATCH] Cleanup2017: make network_equal more robust
by Alexander Marx 26 Jun '17

26 Jun '17

Michael fixed this in a telephone session --- config/cfgroot/network-functions.pl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 66f1ed5..41632c3 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -108,14 +108,22 @@ sub network_equal { my $network1 = shift; my $network2 = shift; - my $bin1 = &network2bin($network1); - my $bin2 = &network2bin($network2); + my @bin1 = &network2bin($network1); + if (scalar @bin1 ne 2) { + return undef; + } - if ($bin1 eq $bin2) { - return 1; + my @bin2 = &network2bin($network2); + if (scalar @bin2 ne 2) { + return undef; } - return 0; + my $address1 = $bin1[0]; + my $netmask1 = $bin1[1]; + my $address2 = $bin2[0]; + my $netmask2 = $bin2[1]; + + return (($address1 eq $address2) && ($netmask1 eq $netmask2)); } # Takes a network in either a.b.c.d/a.b.c.d or a.b.c.d/e notation -- 2.7.4

1 0

[PATCH v3 5/5] color: add colors to zone and ports
by Jonatan Schlag 19 Jun '17

19 Jun '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.colors | 194 +++++++++++++++++++++++++++++++++++++++++ src/functions/functions.ports | 8 ++ src/functions/functions.zone | 8 ++ 3 files changed, 210 insertions(+) diff --git a/src/functions/functions.colors b/src/functions/functions.colors index 8d7193c..121d736 100644 --- a/src/functions/functions.colors +++ b/src/functions/functions.colors @@ -73,3 +73,197 @@ MSG_STP_DISCARDING="${CLR_RED_BG}${CLR_WHITE_B} DISCARDING ${CLR_RESET}" MSG_STP_LEARNING="${CLR_YELLOW_BG}${CLR_WHITE_B} LEARNING ${CLR_RESET}" MSG_STP_LISTENING="${CLR_YELLOW_BG}${CLR_WHITE_B} LISTENING ${CLR_RESET}" MSG_STP_BLOCKING="${CLR_RED_BG}${CLR_WHITE_B} BLOCKING ${CLR_RESET}" + +color_cli() { + # Is the cli function to parse the options submitted by a user. + local type=${1} + local name=${2} + local action=${3} + + case ${action} in + set) + local color=${4} + # Check if we get to many arguments + if [ $# -gt 4 ]; then + # We want to print only the 5th and greater argument + shift 4 + error "Too many arguments: $@" + return ${EXIT_ERROR} + fi + color_set ${type} ${name} ${color} + ;; + reset) + # We set the color to white. + # Check if we get to many arguments + shift + if [ $# -gt 3 ]; then + # We want to print only the 4th and greater argument + shift 3 + error "Too many arguments: $@" + return ${EXIT_ERROR} + fi + color_set ${type} ${name} "ffffff" + ;; + *) + error "Invalid argument: ${action}" + ;; + esac + +} + +color_set() { + # Write a given color into the color config file of a zone or port. + assert [ $# -eq 3 ] + + local type=${1} + local name=${2} + local COLOR=${3} + # Check if we get to many arguments + # Check if the color code is valid + if ! color_hex_is_valid ${COLOR}; then + error "Hexadecimal color code '${COLOR}' is not valid" + return ${EXIT_ERROR} + fi + + local file=$(color_format_filename ${type} ${name}) + settings_write ${file} COLOR +} + +color_read() { + # Read a color out of color config file of a zone or port. + # If this is unsuccessful we use white. + local type=${1} + local name=${2} + + local file=$(color_format_filename ${type} ${name}) + + local COLOR + + if ! settings_read ${file} COLOR; then + COLOR="ffffff" + fi + + print "${COLOR}" +} + +color_format_filename() { + # Formats the color config file name. + local type=${1} + local name=${2} + case ${type} in + zone) + echo "$(zone_dir ${name})/color" + ;; + port) + echo "$(port_dir ${name})/color" + ;; + esac +} + +color_hex_is_valid() { + # Check if a color hex is valid. + [[ ${1} =~ ^[0-9a-fA-F]{6}$ ]] +} + +color_hex2rgb() { + # Converts a color hex into rgb values. + local hex=${1} + + assert [ ${#hex} -eq 6 ] + + for (( i = 0; i < 6; i += 2 )); do + hex2dec ${hex:${i}:2} + done | tr '\n' ' ' + + print # newline +} + +_find_nearest_rgb_value() { + # For the calculation of the xterm value the rgb values must be: + # 0; 95; 135; 175; 215; 255; + # this function find the closest value of these 6 numbers for a give rgb number + local rgb=${1} + + local best_value + local best_value_index + + local values=( 0 95 135 175 215 255 ) + local result + local i=0 + + local value + for value in ${values[@]}; do + result=$(( ${value} - ${rgb} )) + result=$(abs ${result}) + + if [ -z ${best_value} ]; then + best_value=${result} + best_value_index=${i} + + # In the first iteration best_value is empty and so set to ${result} + # two lines above. So if statement must use -le because in the first iteration + # is the best_value eqal to result + elif [ ${result} -le ${best_value} ]; then + best_value=${result} + best_value_index=${i} + fi + + (( i++ )) + done + + echo "${best_value_index}" +} + +color_rgb2shell() { + # Converts a rgb value triple into an xterm color code. + assert [ $# -eq 3 ] + + local red=${1} + local green=${2} + local blue=${3} + + local color + for color in red green blue; do + printf -v "${color}" $(_find_nearest_rgb_value ${!color}) + done + + print $(( 16 + 36 * ${red} + 6 * ${green} + ${blue} )) +} + +color_set_shell() { + # Set the shell color which unfourtunately does not work for putty. + local where=${1} + local color=${2} + + local prefix + case "${where}" in + fg) + prefix="\e[38" + ;; + bg) + prefix="\e[48" + ;; + esac + + # Convert color from hex to RGB + local red green blue + read red green blue <<< $(color_hex2rgb ${color}) + + # Set standard shell color + local shell_color=$(color_rgb2shell ${red} ${green} ${blue}) + printf "${prefix};5;${shell_color}m" + + # For shells that support it, we will try to set the RGB color code + case "${TERM}" in + putty*) + # PuTTY is a piece of garbage and does not know + # how to handle colors at all although it has nice + # checkboxes to enable them, but they actually make + # things even worse. So no colors for you Windows + # users. + ;; + *) + printf "${prefix};2;${red};${green};${blue}m" + ;; + esac +} diff --git a/src/functions/functions.ports b/src/functions/functions.ports index c6e45d0..db4e365 100644 --- a/src/functions/functions.ports +++ b/src/functions/functions.ports @@ -422,3 +422,11 @@ ports_lowest_address() { port_identify() { device_identify $@ } + +port_get_color() { + # This function return the color of a port + assert [ $# -eq 1 ] + + local name=${1} + color_read "port" ${name} +} diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 88c81a8..058110d 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1200,3 +1200,11 @@ zone_port_settings_remove() { local path="$(zone_dir "${zone}")/ports/${port}" settings_remove "${path}" } + +zone_get_color() { + # This function return the color of a zone + assert [ $# -eq 1 ] + + local name=${1} + color_read "zone" ${name} +} -- 2.6.3

2 1

[PATCH v2 1/5] ports: Change ports settings file to /etc/network/${port}/settings
by Jonatan Schlag 19 Jun '17

19 Jun '17

The configuration of a port was stored in a file called: /etc/network/${port} This is bad because it is very hard to add further information which belong primary not to the configuration to this file. So we change the settings file to /etc/network/${port}/settings like for the zones. This make it possible to store other configurations like the color in other files in the directory /etc/network/${port}. A workaround to move the config file into the new directory scheme is: port=p1 && mv /etc/network/ports/${port} /etc/network/ports/${port}-save \ && mkdir -p /etc/network/ports/${port} \ && mv /etc/network/ports/${port}-save /etc/network/ports/${port}/settings where port is the name of the port like p1 or p0. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ports | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/functions/functions.ports b/src/functions/functions.ports index 952eef9..c6e45d0 100644 --- a/src/functions/functions.ports +++ b/src/functions/functions.ports @@ -20,7 +20,8 @@ ############################################################################### port_dir() { - echo "${NETWORK_CONFIG_DIR}/ports" + local port="${1}" + echo "${NETWORK_CONFIG_DIR}/ports/${port}" } port_list() { @@ -113,13 +114,13 @@ port_file() { local port="${1}" assert isset port - echo "$(port_dir)/${port}" + echo "$(port_dir ${port})/settings" } port_exists() { local port=${1} - [ -f "${NETWORK_CONFIG_DIR}/ports/${port}" ] + [ -d "${NETWORK_CONFIG_DIR}/ports/${port}" ] } port_get_hook() { @@ -207,7 +208,7 @@ port_destroy() { port_remove "${port}" - rm -f $(port_file ${port}) + rm -rf $(port_dir ${port}) } port_create() { -- 2.6.3

2 5

[PATCH v2] grub: update to 2.02
by Marcel Lorenz 15 Jun '17

15 Jun '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/i586/grub | 127 +++++++++++++++++++- config/rootfiles/common/x86_64/grub | 129 ++++++++++++++++++++- lfs/grub | 20 ++-- ...E-2015-8370-Grub2-user-pass-vulnerability.patch | 45 ------- src/patches/grub-2.00_disable_vga_fallback.patch | 15 --- src/patches/grub2-remove-gets.patch | 21 ---- 6 files changed, 258 insertions(+), 99 deletions(-) delete mode 100644 src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch delete mode 100644 src/patches/grub-2.00_disable_vga_fallback.patch delete mode 100644 src/patches/grub2-remove-gets.patch diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 9d71942..5299f73 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -15,19 +15,24 @@ etc/grub.d/41_custom etc/grub.d/README etc/grub2.cfg usr/bin/grub-editenv +usr/bin/grub-file usr/bin/grub-fstest +usr/bin/grub-glue-efi usr/bin/grub-kbdcomp usr/bin/grub-menulst2cfg usr/bin/grub-mkfont usr/bin/grub-mkimage usr/bin/grub-mklayout +usr/bin/grub-mknetdir usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkrelpath usr/bin/grub-mkrescue usr/bin/grub-mkstandalone +usr/bin/grub-render-label usr/bin/grub-script-check -usr/lib/grub -usr/lib/grub/i386-pc +usr/bin/grub-syslinux2cfg +#usr/lib/grub +#usr/lib/grub/i386-pc usr/lib/grub/i386-pc/acpi.mod usr/lib/grub/i386-pc/acpi.module usr/lib/grub/i386-pc/adler32.mod @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod usr/lib/grub/i386-pc/all_video.module usr/lib/grub/i386-pc/aout.mod usr/lib/grub/i386-pc/aout.module +usr/lib/grub/i386-pc/archelp.mod +usr/lib/grub/i386-pc/archelp.module usr/lib/grub/i386-pc/at_keyboard.mod usr/lib/grub/i386-pc/at_keyboard.module usr/lib/grub/i386-pc/ata.mod @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image usr/lib/grub/i386-pc/boot.img usr/lib/grub/i386-pc/boot.mod usr/lib/grub/i386-pc/boot.module +usr/lib/grub/i386-pc/boot_hybrid.image +usr/lib/grub/i386-pc/boot_hybrid.img usr/lib/grub/i386-pc/bsd.mod usr/lib/grub/i386-pc/bsd.module +usr/lib/grub/i386-pc/bswap_test.mod +usr/lib/grub/i386-pc/bswap_test.module usr/lib/grub/i386-pc/btrfs.mod usr/lib/grub/i386-pc/btrfs.module usr/lib/grub/i386-pc/bufio.mod usr/lib/grub/i386-pc/bufio.module usr/lib/grub/i386-pc/cat.mod usr/lib/grub/i386-pc/cat.module +usr/lib/grub/i386-pc/cbfs.mod +usr/lib/grub/i386-pc/cbfs.module +usr/lib/grub/i386-pc/cbls.mod +usr/lib/grub/i386-pc/cbls.module +usr/lib/grub/i386-pc/cbmemc.mod +usr/lib/grub/i386-pc/cbmemc.module +usr/lib/grub/i386-pc/cbtable.mod +usr/lib/grub/i386-pc/cbtable.module +usr/lib/grub/i386-pc/cbtime.mod +usr/lib/grub/i386-pc/cbtime.module usr/lib/grub/i386-pc/cdboot.image usr/lib/grub/i386-pc/cdboot.img usr/lib/grub/i386-pc/chain.mod usr/lib/grub/i386-pc/chain.module +usr/lib/grub/i386-pc/cmdline_cat_test.mod +usr/lib/grub/i386-pc/cmdline_cat_test.module +usr/lib/grub/i386-pc/cmosdump.mod +usr/lib/grub/i386-pc/cmosdump.module usr/lib/grub/i386-pc/cmostest.mod usr/lib/grub/i386-pc/cmostest.module usr/lib/grub/i386-pc/cmp.mod usr/lib/grub/i386-pc/cmp.module +usr/lib/grub/i386-pc/cmp_test.mod +usr/lib/grub/i386-pc/cmp_test.module usr/lib/grub/i386-pc/command.lst usr/lib/grub/i386-pc/config.h usr/lib/grub/i386-pc/configfile.mod @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod usr/lib/grub/i386-pc/cryptodisk.module usr/lib/grub/i386-pc/cs5536.mod usr/lib/grub/i386-pc/cs5536.module +usr/lib/grub/i386-pc/ctz_test.mod +usr/lib/grub/i386-pc/ctz_test.module usr/lib/grub/i386-pc/date.mod usr/lib/grub/i386-pc/date.module usr/lib/grub/i386-pc/datehook.mod usr/lib/grub/i386-pc/datehook.module usr/lib/grub/i386-pc/datetime.mod usr/lib/grub/i386-pc/datetime.module +usr/lib/grub/i386-pc/disk.mod +usr/lib/grub/i386-pc/disk.module usr/lib/grub/i386-pc/diskboot.image usr/lib/grub/i386-pc/diskboot.img usr/lib/grub/i386-pc/diskfilter.mod usr/lib/grub/i386-pc/diskfilter.module +usr/lib/grub/i386-pc/div.mod +usr/lib/grub/i386-pc/div.module +usr/lib/grub/i386-pc/div_test.mod +usr/lib/grub/i386-pc/div_test.module usr/lib/grub/i386-pc/dm_nv.mod usr/lib/grub/i386-pc/dm_nv.module usr/lib/grub/i386-pc/drivemap.mod @@ -119,6 +154,8 @@ usr/lib/grub/i386-pc/ehci.mod usr/lib/grub/i386-pc/ehci.module usr/lib/grub/i386-pc/elf.mod usr/lib/grub/i386-pc/elf.module +usr/lib/grub/i386-pc/eval.mod +usr/lib/grub/i386-pc/eval.module usr/lib/grub/i386-pc/exfat.mod usr/lib/grub/i386-pc/exfat.module usr/lib/grub/i386-pc/exfctest.mod @@ -129,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod usr/lib/grub/i386-pc/extcmd.module usr/lib/grub/i386-pc/fat.mod usr/lib/grub/i386-pc/fat.module +usr/lib/grub/i386-pc/file.mod +usr/lib/grub/i386-pc/file.module usr/lib/grub/i386-pc/font.mod usr/lib/grub/i386-pc/font.module usr/lib/grub/i386-pc/freedos.mod @@ -150,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod usr/lib/grub/i386-pc/gcry_crc.module usr/lib/grub/i386-pc/gcry_des.mod usr/lib/grub/i386-pc/gcry_des.module +usr/lib/grub/i386-pc/gcry_dsa.mod +usr/lib/grub/i386-pc/gcry_dsa.module +usr/lib/grub/i386-pc/gcry_idea.mod +usr/lib/grub/i386-pc/gcry_idea.module usr/lib/grub/i386-pc/gcry_md4.mod usr/lib/grub/i386-pc/gcry_md4.module usr/lib/grub/i386-pc/gcry_md5.mod @@ -160,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod usr/lib/grub/i386-pc/gcry_rijndael.module usr/lib/grub/i386-pc/gcry_rmd160.mod usr/lib/grub/i386-pc/gcry_rmd160.module +usr/lib/grub/i386-pc/gcry_rsa.mod +usr/lib/grub/i386-pc/gcry_rsa.module usr/lib/grub/i386-pc/gcry_seed.mod usr/lib/grub/i386-pc/gcry_seed.module usr/lib/grub/i386-pc/gcry_serpent.mod @@ -187,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod usr/lib/grub/i386-pc/gfxmenu.module usr/lib/grub/i386-pc/gfxterm.mod usr/lib/grub/i386-pc/gfxterm.module +usr/lib/grub/i386-pc/gfxterm_background.mod +usr/lib/grub/i386-pc/gfxterm_background.module +usr/lib/grub/i386-pc/gfxterm_menu.mod +usr/lib/grub/i386-pc/gfxterm_menu.module usr/lib/grub/i386-pc/gmodule.pl usr/lib/grub/i386-pc/gptsync.mod usr/lib/grub/i386-pc/gptsync.module @@ -208,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod usr/lib/grub/i386-pc/hfs.module usr/lib/grub/i386-pc/hfsplus.mod usr/lib/grub/i386-pc/hfsplus.module +usr/lib/grub/i386-pc/hfspluscomp.mod +usr/lib/grub/i386-pc/hfspluscomp.module usr/lib/grub/i386-pc/http.mod usr/lib/grub/i386-pc/http.module usr/lib/grub/i386-pc/iorw.mod @@ -226,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod usr/lib/grub/i386-pc/keystatus.module usr/lib/grub/i386-pc/ldm.mod usr/lib/grub/i386-pc/ldm.module +usr/lib/grub/i386-pc/legacy_password_test.mod +usr/lib/grub/i386-pc/legacy_password_test.module usr/lib/grub/i386-pc/legacycfg.mod usr/lib/grub/i386-pc/legacycfg.module usr/lib/grub/i386-pc/linux.mod @@ -256,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image usr/lib/grub/i386-pc/lzma_decompress.img usr/lib/grub/i386-pc/lzopio.mod usr/lib/grub/i386-pc/lzopio.module +usr/lib/grub/i386-pc/macbless.mod +usr/lib/grub/i386-pc/macbless.module +usr/lib/grub/i386-pc/macho.mod +usr/lib/grub/i386-pc/macho.module +usr/lib/grub/i386-pc/mda_text.mod +usr/lib/grub/i386-pc/mda_text.module usr/lib/grub/i386-pc/mdraid09.mod usr/lib/grub/i386-pc/mdraid09.module usr/lib/grub/i386-pc/mdraid09_be.mod @@ -284,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod usr/lib/grub/i386-pc/mmap.module usr/lib/grub/i386-pc/moddep.lst usr/lib/grub/i386-pc/modinfo.sh +usr/lib/grub/i386-pc/morse.mod +usr/lib/grub/i386-pc/morse.module +usr/lib/grub/i386-pc/mpi.mod +usr/lib/grub/i386-pc/mpi.module usr/lib/grub/i386-pc/msdospart.mod usr/lib/grub/i386-pc/msdospart.module +usr/lib/grub/i386-pc/mul_test.mod +usr/lib/grub/i386-pc/mul_test.module usr/lib/grub/i386-pc/multiboot.mod usr/lib/grub/i386-pc/multiboot.module usr/lib/grub/i386-pc/multiboot2.mod usr/lib/grub/i386-pc/multiboot2.module +usr/lib/grub/i386-pc/nativedisk.mod +usr/lib/grub/i386-pc/nativedisk.module usr/lib/grub/i386-pc/net.mod usr/lib/grub/i386-pc/net.module usr/lib/grub/i386-pc/newc.mod @@ -306,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod usr/lib/grub/i386-pc/ntldr.module usr/lib/grub/i386-pc/odc.mod usr/lib/grub/i386-pc/odc.module +usr/lib/grub/i386-pc/offsetio.mod +usr/lib/grub/i386-pc/offsetio.module usr/lib/grub/i386-pc/ohci.mod usr/lib/grub/i386-pc/ohci.module usr/lib/grub/i386-pc/part_acorn.mod @@ -316,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod usr/lib/grub/i386-pc/part_apple.module usr/lib/grub/i386-pc/part_bsd.mod usr/lib/grub/i386-pc/part_bsd.module +usr/lib/grub/i386-pc/part_dfly.mod +usr/lib/grub/i386-pc/part_dfly.module usr/lib/grub/i386-pc/part_dvh.mod usr/lib/grub/i386-pc/part_dvh.module usr/lib/grub/i386-pc/part_gpt.mod @@ -340,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod usr/lib/grub/i386-pc/pata.module usr/lib/grub/i386-pc/pbkdf2.mod usr/lib/grub/i386-pc/pbkdf2.module +usr/lib/grub/i386-pc/pbkdf2_test.mod +usr/lib/grub/i386-pc/pbkdf2_test.module usr/lib/grub/i386-pc/pci.mod usr/lib/grub/i386-pc/pci.module +usr/lib/grub/i386-pc/pcidump.mod +usr/lib/grub/i386-pc/pcidump.module usr/lib/grub/i386-pc/plan9.mod usr/lib/grub/i386-pc/plan9.module usr/lib/grub/i386-pc/play.mod @@ -352,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod usr/lib/grub/i386-pc/priority_queue.module usr/lib/grub/i386-pc/probe.mod usr/lib/grub/i386-pc/probe.module +usr/lib/grub/i386-pc/procfs.mod +usr/lib/grub/i386-pc/procfs.module +usr/lib/grub/i386-pc/progress.mod +usr/lib/grub/i386-pc/progress.module usr/lib/grub/i386-pc/pxe.mod usr/lib/grub/i386-pc/pxe.module usr/lib/grub/i386-pc/pxeboot.image @@ -362,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod usr/lib/grub/i386-pc/raid5rec.module usr/lib/grub/i386-pc/raid6rec.mod usr/lib/grub/i386-pc/raid6rec.module +usr/lib/grub/i386-pc/random.mod +usr/lib/grub/i386-pc/random.module usr/lib/grub/i386-pc/read.mod usr/lib/grub/i386-pc/read.module usr/lib/grub/i386-pc/reboot.mod @@ -390,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod usr/lib/grub/i386-pc/serial.module usr/lib/grub/i386-pc/setjmp.mod usr/lib/grub/i386-pc/setjmp.module +usr/lib/grub/i386-pc/setjmp_test.mod +usr/lib/grub/i386-pc/setjmp_test.module usr/lib/grub/i386-pc/setpci.mod usr/lib/grub/i386-pc/setpci.module usr/lib/grub/i386-pc/sfs.mod usr/lib/grub/i386-pc/sfs.module +usr/lib/grub/i386-pc/shift_test.mod +usr/lib/grub/i386-pc/shift_test.module +usr/lib/grub/i386-pc/signature_test.mod +usr/lib/grub/i386-pc/signature_test.module usr/lib/grub/i386-pc/sleep.mod usr/lib/grub/i386-pc/sleep.module +usr/lib/grub/i386-pc/sleep_test.mod +usr/lib/grub/i386-pc/sleep_test.module +usr/lib/grub/i386-pc/spkmodem.mod +usr/lib/grub/i386-pc/spkmodem.module usr/lib/grub/i386-pc/squash4.mod usr/lib/grub/i386-pc/squash4.module +usr/lib/grub/i386-pc/syslinuxcfg.mod +usr/lib/grub/i386-pc/syslinuxcfg.module usr/lib/grub/i386-pc/tar.mod usr/lib/grub/i386-pc/tar.module usr/lib/grub/i386-pc/terminal.lst @@ -411,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod usr/lib/grub/i386-pc/test_blockarg.module usr/lib/grub/i386-pc/testload.mod usr/lib/grub/i386-pc/testload.module +usr/lib/grub/i386-pc/testspeed.mod +usr/lib/grub/i386-pc/testspeed.module usr/lib/grub/i386-pc/tftp.mod usr/lib/grub/i386-pc/tftp.module usr/lib/grub/i386-pc/tga.mod usr/lib/grub/i386-pc/tga.module usr/lib/grub/i386-pc/time.mod usr/lib/grub/i386-pc/time.module +usr/lib/grub/i386-pc/tr.mod +usr/lib/grub/i386-pc/tr.module usr/lib/grub/i386-pc/trig.mod usr/lib/grub/i386-pc/trig.module usr/lib/grub/i386-pc/true.mod usr/lib/grub/i386-pc/true.module +usr/lib/grub/i386-pc/truecrypt.mod +usr/lib/grub/i386-pc/truecrypt.module usr/lib/grub/i386-pc/udf.mod usr/lib/grub/i386-pc/udf.module usr/lib/grub/i386-pc/ufs1.mod usr/lib/grub/i386-pc/ufs1.module +usr/lib/grub/i386-pc/ufs1_be.mod +usr/lib/grub/i386-pc/ufs1_be.module usr/lib/grub/i386-pc/ufs2.mod usr/lib/grub/i386-pc/ufs2.module usr/lib/grub/i386-pc/uhci.mod @@ -441,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod usr/lib/grub/i386-pc/usbserial_ftdi.module usr/lib/grub/i386-pc/usbserial_pl2303.mod usr/lib/grub/i386-pc/usbserial_pl2303.module +usr/lib/grub/i386-pc/usbserial_usbdebug.mod +usr/lib/grub/i386-pc/usbserial_usbdebug.module usr/lib/grub/i386-pc/usbtest.mod usr/lib/grub/i386-pc/usbtest.module usr/lib/grub/i386-pc/vbe.mod usr/lib/grub/i386-pc/vbe.module +usr/lib/grub/i386-pc/verify.mod +usr/lib/grub/i386-pc/verify.module usr/lib/grub/i386-pc/vga.mod usr/lib/grub/i386-pc/vga.module usr/lib/grub/i386-pc/vga_text.mod @@ -456,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod usr/lib/grub/i386-pc/video_bochs.module usr/lib/grub/i386-pc/video_cirrus.mod usr/lib/grub/i386-pc/video_cirrus.module +usr/lib/grub/i386-pc/video_colors.mod +usr/lib/grub/i386-pc/video_colors.module usr/lib/grub/i386-pc/video_fb.mod usr/lib/grub/i386-pc/video_fb.module usr/lib/grub/i386-pc/videoinfo.mod usr/lib/grub/i386-pc/videoinfo.module usr/lib/grub/i386-pc/videotest.mod usr/lib/grub/i386-pc/videotest.module +usr/lib/grub/i386-pc/videotest_checksum.mod +usr/lib/grub/i386-pc/videotest_checksum.module usr/lib/grub/i386-pc/xfs.mod usr/lib/grub/i386-pc/xfs.module usr/lib/grub/i386-pc/xnu.mod usr/lib/grub/i386-pc/xnu.module usr/lib/grub/i386-pc/xnu_uuid.mod usr/lib/grub/i386-pc/xnu_uuid.module +usr/lib/grub/i386-pc/xnu_uuid_test.mod +usr/lib/grub/i386-pc/xnu_uuid_test.module usr/lib/grub/i386-pc/xzio.mod usr/lib/grub/i386-pc/xzio.module usr/lib/grub/i386-pc/zfs.mod @@ -478,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod usr/lib/grub/i386-pc/zfsinfo.module usr/sbin/grub-bios-setup usr/sbin/grub-install +usr/sbin/grub-macbless usr/sbin/grub-mkconfig -usr/sbin/grub-mknetdir usr/sbin/grub-ofpathname usr/sbin/grub-probe usr/sbin/grub-reboot @@ -518,19 +629,29 @@ usr/share/grub/grub-mkconfig_lib #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo #usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo #usr/share/locale/fi/LC_MESSAGES/grub.mo #usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo #usr/share/locale/hu/LC_MESSAGES/grub.mo #usr/share/locale/id/LC_MESSAGES/grub.mo #usr/share/locale/it/LC_MESSAGES/grub.mo #usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo #usr/share/locale/nl/LC_MESSAGES/grub.mo #usr/share/locale/pa #usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/grub.mo #usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo #usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo #usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo #usr/share/locale/uk/LC_MESSAGES/grub.mo #usr/share/locale/vi/LC_MESSAGES/grub.mo #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 19aef9b..5299f73 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -15,19 +15,24 @@ etc/grub.d/41_custom etc/grub.d/README etc/grub2.cfg usr/bin/grub-editenv +usr/bin/grub-file usr/bin/grub-fstest +usr/bin/grub-glue-efi usr/bin/grub-kbdcomp usr/bin/grub-menulst2cfg usr/bin/grub-mkfont usr/bin/grub-mkimage usr/bin/grub-mklayout +usr/bin/grub-mknetdir usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkrelpath usr/bin/grub-mkrescue usr/bin/grub-mkstandalone +usr/bin/grub-render-label usr/bin/grub-script-check -usr/lib/grub -usr/lib/grub/i386-pc +usr/bin/grub-syslinux2cfg +#usr/lib/grub +#usr/lib/grub/i386-pc usr/lib/grub/i386-pc/acpi.mod usr/lib/grub/i386-pc/acpi.module usr/lib/grub/i386-pc/adler32.mod @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod usr/lib/grub/i386-pc/all_video.module usr/lib/grub/i386-pc/aout.mod usr/lib/grub/i386-pc/aout.module +usr/lib/grub/i386-pc/archelp.mod +usr/lib/grub/i386-pc/archelp.module usr/lib/grub/i386-pc/at_keyboard.mod usr/lib/grub/i386-pc/at_keyboard.module usr/lib/grub/i386-pc/ata.mod @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image usr/lib/grub/i386-pc/boot.img usr/lib/grub/i386-pc/boot.mod usr/lib/grub/i386-pc/boot.module +usr/lib/grub/i386-pc/boot_hybrid.image +usr/lib/grub/i386-pc/boot_hybrid.img usr/lib/grub/i386-pc/bsd.mod usr/lib/grub/i386-pc/bsd.module +usr/lib/grub/i386-pc/bswap_test.mod +usr/lib/grub/i386-pc/bswap_test.module usr/lib/grub/i386-pc/btrfs.mod usr/lib/grub/i386-pc/btrfs.module usr/lib/grub/i386-pc/bufio.mod usr/lib/grub/i386-pc/bufio.module usr/lib/grub/i386-pc/cat.mod usr/lib/grub/i386-pc/cat.module +usr/lib/grub/i386-pc/cbfs.mod +usr/lib/grub/i386-pc/cbfs.module +usr/lib/grub/i386-pc/cbls.mod +usr/lib/grub/i386-pc/cbls.module +usr/lib/grub/i386-pc/cbmemc.mod +usr/lib/grub/i386-pc/cbmemc.module +usr/lib/grub/i386-pc/cbtable.mod +usr/lib/grub/i386-pc/cbtable.module +usr/lib/grub/i386-pc/cbtime.mod +usr/lib/grub/i386-pc/cbtime.module usr/lib/grub/i386-pc/cdboot.image usr/lib/grub/i386-pc/cdboot.img usr/lib/grub/i386-pc/chain.mod usr/lib/grub/i386-pc/chain.module +usr/lib/grub/i386-pc/cmdline_cat_test.mod +usr/lib/grub/i386-pc/cmdline_cat_test.module +usr/lib/grub/i386-pc/cmosdump.mod +usr/lib/grub/i386-pc/cmosdump.module usr/lib/grub/i386-pc/cmostest.mod usr/lib/grub/i386-pc/cmostest.module usr/lib/grub/i386-pc/cmp.mod usr/lib/grub/i386-pc/cmp.module +usr/lib/grub/i386-pc/cmp_test.mod +usr/lib/grub/i386-pc/cmp_test.module usr/lib/grub/i386-pc/command.lst usr/lib/grub/i386-pc/config.h usr/lib/grub/i386-pc/configfile.mod @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod usr/lib/grub/i386-pc/cryptodisk.module usr/lib/grub/i386-pc/cs5536.mod usr/lib/grub/i386-pc/cs5536.module +usr/lib/grub/i386-pc/ctz_test.mod +usr/lib/grub/i386-pc/ctz_test.module usr/lib/grub/i386-pc/date.mod usr/lib/grub/i386-pc/date.module usr/lib/grub/i386-pc/datehook.mod usr/lib/grub/i386-pc/datehook.module usr/lib/grub/i386-pc/datetime.mod usr/lib/grub/i386-pc/datetime.module +usr/lib/grub/i386-pc/disk.mod +usr/lib/grub/i386-pc/disk.module usr/lib/grub/i386-pc/diskboot.image usr/lib/grub/i386-pc/diskboot.img usr/lib/grub/i386-pc/diskfilter.mod usr/lib/grub/i386-pc/diskfilter.module +usr/lib/grub/i386-pc/div.mod +usr/lib/grub/i386-pc/div.module +usr/lib/grub/i386-pc/div_test.mod +usr/lib/grub/i386-pc/div_test.module usr/lib/grub/i386-pc/dm_nv.mod usr/lib/grub/i386-pc/dm_nv.module usr/lib/grub/i386-pc/drivemap.mod @@ -115,12 +150,12 @@ usr/lib/grub/i386-pc/echo.mod usr/lib/grub/i386-pc/echo.module usr/lib/grub/i386-pc/efiemu.mod usr/lib/grub/i386-pc/efiemu.module -usr/lib/grub/i386-pc/efiemu32.o -usr/lib/grub/i386-pc/efiemu64.o usr/lib/grub/i386-pc/ehci.mod usr/lib/grub/i386-pc/ehci.module usr/lib/grub/i386-pc/elf.mod usr/lib/grub/i386-pc/elf.module +usr/lib/grub/i386-pc/eval.mod +usr/lib/grub/i386-pc/eval.module usr/lib/grub/i386-pc/exfat.mod usr/lib/grub/i386-pc/exfat.module usr/lib/grub/i386-pc/exfctest.mod @@ -131,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod usr/lib/grub/i386-pc/extcmd.module usr/lib/grub/i386-pc/fat.mod usr/lib/grub/i386-pc/fat.module +usr/lib/grub/i386-pc/file.mod +usr/lib/grub/i386-pc/file.module usr/lib/grub/i386-pc/font.mod usr/lib/grub/i386-pc/font.module usr/lib/grub/i386-pc/freedos.mod @@ -152,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod usr/lib/grub/i386-pc/gcry_crc.module usr/lib/grub/i386-pc/gcry_des.mod usr/lib/grub/i386-pc/gcry_des.module +usr/lib/grub/i386-pc/gcry_dsa.mod +usr/lib/grub/i386-pc/gcry_dsa.module +usr/lib/grub/i386-pc/gcry_idea.mod +usr/lib/grub/i386-pc/gcry_idea.module usr/lib/grub/i386-pc/gcry_md4.mod usr/lib/grub/i386-pc/gcry_md4.module usr/lib/grub/i386-pc/gcry_md5.mod @@ -162,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod usr/lib/grub/i386-pc/gcry_rijndael.module usr/lib/grub/i386-pc/gcry_rmd160.mod usr/lib/grub/i386-pc/gcry_rmd160.module +usr/lib/grub/i386-pc/gcry_rsa.mod +usr/lib/grub/i386-pc/gcry_rsa.module usr/lib/grub/i386-pc/gcry_seed.mod usr/lib/grub/i386-pc/gcry_seed.module usr/lib/grub/i386-pc/gcry_serpent.mod @@ -189,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod usr/lib/grub/i386-pc/gfxmenu.module usr/lib/grub/i386-pc/gfxterm.mod usr/lib/grub/i386-pc/gfxterm.module +usr/lib/grub/i386-pc/gfxterm_background.mod +usr/lib/grub/i386-pc/gfxterm_background.module +usr/lib/grub/i386-pc/gfxterm_menu.mod +usr/lib/grub/i386-pc/gfxterm_menu.module usr/lib/grub/i386-pc/gmodule.pl usr/lib/grub/i386-pc/gptsync.mod usr/lib/grub/i386-pc/gptsync.module @@ -210,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod usr/lib/grub/i386-pc/hfs.module usr/lib/grub/i386-pc/hfsplus.mod usr/lib/grub/i386-pc/hfsplus.module +usr/lib/grub/i386-pc/hfspluscomp.mod +usr/lib/grub/i386-pc/hfspluscomp.module usr/lib/grub/i386-pc/http.mod usr/lib/grub/i386-pc/http.module usr/lib/grub/i386-pc/iorw.mod @@ -228,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod usr/lib/grub/i386-pc/keystatus.module usr/lib/grub/i386-pc/ldm.mod usr/lib/grub/i386-pc/ldm.module +usr/lib/grub/i386-pc/legacy_password_test.mod +usr/lib/grub/i386-pc/legacy_password_test.module usr/lib/grub/i386-pc/legacycfg.mod usr/lib/grub/i386-pc/legacycfg.module usr/lib/grub/i386-pc/linux.mod @@ -258,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image usr/lib/grub/i386-pc/lzma_decompress.img usr/lib/grub/i386-pc/lzopio.mod usr/lib/grub/i386-pc/lzopio.module +usr/lib/grub/i386-pc/macbless.mod +usr/lib/grub/i386-pc/macbless.module +usr/lib/grub/i386-pc/macho.mod +usr/lib/grub/i386-pc/macho.module +usr/lib/grub/i386-pc/mda_text.mod +usr/lib/grub/i386-pc/mda_text.module usr/lib/grub/i386-pc/mdraid09.mod usr/lib/grub/i386-pc/mdraid09.module usr/lib/grub/i386-pc/mdraid09_be.mod @@ -286,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod usr/lib/grub/i386-pc/mmap.module usr/lib/grub/i386-pc/moddep.lst usr/lib/grub/i386-pc/modinfo.sh +usr/lib/grub/i386-pc/morse.mod +usr/lib/grub/i386-pc/morse.module +usr/lib/grub/i386-pc/mpi.mod +usr/lib/grub/i386-pc/mpi.module usr/lib/grub/i386-pc/msdospart.mod usr/lib/grub/i386-pc/msdospart.module +usr/lib/grub/i386-pc/mul_test.mod +usr/lib/grub/i386-pc/mul_test.module usr/lib/grub/i386-pc/multiboot.mod usr/lib/grub/i386-pc/multiboot.module usr/lib/grub/i386-pc/multiboot2.mod usr/lib/grub/i386-pc/multiboot2.module +usr/lib/grub/i386-pc/nativedisk.mod +usr/lib/grub/i386-pc/nativedisk.module usr/lib/grub/i386-pc/net.mod usr/lib/grub/i386-pc/net.module usr/lib/grub/i386-pc/newc.mod @@ -308,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod usr/lib/grub/i386-pc/ntldr.module usr/lib/grub/i386-pc/odc.mod usr/lib/grub/i386-pc/odc.module +usr/lib/grub/i386-pc/offsetio.mod +usr/lib/grub/i386-pc/offsetio.module usr/lib/grub/i386-pc/ohci.mod usr/lib/grub/i386-pc/ohci.module usr/lib/grub/i386-pc/part_acorn.mod @@ -318,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod usr/lib/grub/i386-pc/part_apple.module usr/lib/grub/i386-pc/part_bsd.mod usr/lib/grub/i386-pc/part_bsd.module +usr/lib/grub/i386-pc/part_dfly.mod +usr/lib/grub/i386-pc/part_dfly.module usr/lib/grub/i386-pc/part_dvh.mod usr/lib/grub/i386-pc/part_dvh.module usr/lib/grub/i386-pc/part_gpt.mod @@ -342,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod usr/lib/grub/i386-pc/pata.module usr/lib/grub/i386-pc/pbkdf2.mod usr/lib/grub/i386-pc/pbkdf2.module +usr/lib/grub/i386-pc/pbkdf2_test.mod +usr/lib/grub/i386-pc/pbkdf2_test.module usr/lib/grub/i386-pc/pci.mod usr/lib/grub/i386-pc/pci.module +usr/lib/grub/i386-pc/pcidump.mod +usr/lib/grub/i386-pc/pcidump.module usr/lib/grub/i386-pc/plan9.mod usr/lib/grub/i386-pc/plan9.module usr/lib/grub/i386-pc/play.mod @@ -354,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod usr/lib/grub/i386-pc/priority_queue.module usr/lib/grub/i386-pc/probe.mod usr/lib/grub/i386-pc/probe.module +usr/lib/grub/i386-pc/procfs.mod +usr/lib/grub/i386-pc/procfs.module +usr/lib/grub/i386-pc/progress.mod +usr/lib/grub/i386-pc/progress.module usr/lib/grub/i386-pc/pxe.mod usr/lib/grub/i386-pc/pxe.module usr/lib/grub/i386-pc/pxeboot.image @@ -364,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod usr/lib/grub/i386-pc/raid5rec.module usr/lib/grub/i386-pc/raid6rec.mod usr/lib/grub/i386-pc/raid6rec.module +usr/lib/grub/i386-pc/random.mod +usr/lib/grub/i386-pc/random.module usr/lib/grub/i386-pc/read.mod usr/lib/grub/i386-pc/read.module usr/lib/grub/i386-pc/reboot.mod @@ -392,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod usr/lib/grub/i386-pc/serial.module usr/lib/grub/i386-pc/setjmp.mod usr/lib/grub/i386-pc/setjmp.module +usr/lib/grub/i386-pc/setjmp_test.mod +usr/lib/grub/i386-pc/setjmp_test.module usr/lib/grub/i386-pc/setpci.mod usr/lib/grub/i386-pc/setpci.module usr/lib/grub/i386-pc/sfs.mod usr/lib/grub/i386-pc/sfs.module +usr/lib/grub/i386-pc/shift_test.mod +usr/lib/grub/i386-pc/shift_test.module +usr/lib/grub/i386-pc/signature_test.mod +usr/lib/grub/i386-pc/signature_test.module usr/lib/grub/i386-pc/sleep.mod usr/lib/grub/i386-pc/sleep.module +usr/lib/grub/i386-pc/sleep_test.mod +usr/lib/grub/i386-pc/sleep_test.module +usr/lib/grub/i386-pc/spkmodem.mod +usr/lib/grub/i386-pc/spkmodem.module usr/lib/grub/i386-pc/squash4.mod usr/lib/grub/i386-pc/squash4.module +usr/lib/grub/i386-pc/syslinuxcfg.mod +usr/lib/grub/i386-pc/syslinuxcfg.module usr/lib/grub/i386-pc/tar.mod usr/lib/grub/i386-pc/tar.module usr/lib/grub/i386-pc/terminal.lst @@ -413,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod usr/lib/grub/i386-pc/test_blockarg.module usr/lib/grub/i386-pc/testload.mod usr/lib/grub/i386-pc/testload.module +usr/lib/grub/i386-pc/testspeed.mod +usr/lib/grub/i386-pc/testspeed.module usr/lib/grub/i386-pc/tftp.mod usr/lib/grub/i386-pc/tftp.module usr/lib/grub/i386-pc/tga.mod usr/lib/grub/i386-pc/tga.module usr/lib/grub/i386-pc/time.mod usr/lib/grub/i386-pc/time.module +usr/lib/grub/i386-pc/tr.mod +usr/lib/grub/i386-pc/tr.module usr/lib/grub/i386-pc/trig.mod usr/lib/grub/i386-pc/trig.module usr/lib/grub/i386-pc/true.mod usr/lib/grub/i386-pc/true.module +usr/lib/grub/i386-pc/truecrypt.mod +usr/lib/grub/i386-pc/truecrypt.module usr/lib/grub/i386-pc/udf.mod usr/lib/grub/i386-pc/udf.module usr/lib/grub/i386-pc/ufs1.mod usr/lib/grub/i386-pc/ufs1.module +usr/lib/grub/i386-pc/ufs1_be.mod +usr/lib/grub/i386-pc/ufs1_be.module usr/lib/grub/i386-pc/ufs2.mod usr/lib/grub/i386-pc/ufs2.module usr/lib/grub/i386-pc/uhci.mod @@ -443,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod usr/lib/grub/i386-pc/usbserial_ftdi.module usr/lib/grub/i386-pc/usbserial_pl2303.mod usr/lib/grub/i386-pc/usbserial_pl2303.module +usr/lib/grub/i386-pc/usbserial_usbdebug.mod +usr/lib/grub/i386-pc/usbserial_usbdebug.module usr/lib/grub/i386-pc/usbtest.mod usr/lib/grub/i386-pc/usbtest.module usr/lib/grub/i386-pc/vbe.mod usr/lib/grub/i386-pc/vbe.module +usr/lib/grub/i386-pc/verify.mod +usr/lib/grub/i386-pc/verify.module usr/lib/grub/i386-pc/vga.mod usr/lib/grub/i386-pc/vga.module usr/lib/grub/i386-pc/vga_text.mod @@ -458,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod usr/lib/grub/i386-pc/video_bochs.module usr/lib/grub/i386-pc/video_cirrus.mod usr/lib/grub/i386-pc/video_cirrus.module +usr/lib/grub/i386-pc/video_colors.mod +usr/lib/grub/i386-pc/video_colors.module usr/lib/grub/i386-pc/video_fb.mod usr/lib/grub/i386-pc/video_fb.module usr/lib/grub/i386-pc/videoinfo.mod usr/lib/grub/i386-pc/videoinfo.module usr/lib/grub/i386-pc/videotest.mod usr/lib/grub/i386-pc/videotest.module +usr/lib/grub/i386-pc/videotest_checksum.mod +usr/lib/grub/i386-pc/videotest_checksum.module usr/lib/grub/i386-pc/xfs.mod usr/lib/grub/i386-pc/xfs.module usr/lib/grub/i386-pc/xnu.mod usr/lib/grub/i386-pc/xnu.module usr/lib/grub/i386-pc/xnu_uuid.mod usr/lib/grub/i386-pc/xnu_uuid.module +usr/lib/grub/i386-pc/xnu_uuid_test.mod +usr/lib/grub/i386-pc/xnu_uuid_test.module usr/lib/grub/i386-pc/xzio.mod usr/lib/grub/i386-pc/xzio.module usr/lib/grub/i386-pc/zfs.mod @@ -480,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod usr/lib/grub/i386-pc/zfsinfo.module usr/sbin/grub-bios-setup usr/sbin/grub-install +usr/sbin/grub-macbless usr/sbin/grub-mkconfig -usr/sbin/grub-mknetdir usr/sbin/grub-ofpathname usr/sbin/grub-probe usr/sbin/grub-reboot @@ -520,19 +629,29 @@ usr/share/grub/grub-mkconfig_lib #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo #usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo #usr/share/locale/fi/LC_MESSAGES/grub.mo #usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo #usr/share/locale/hu/LC_MESSAGES/grub.mo #usr/share/locale/id/LC_MESSAGES/grub.mo #usr/share/locale/it/LC_MESSAGES/grub.mo #usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo #usr/share/locale/nl/LC_MESSAGES/grub.mo #usr/share/locale/pa #usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/grub.mo #usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo #usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo #usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo #usr/share/locale/uk/LC_MESSAGES/grub.mo #usr/share/locale/vi/LC_MESSAGES/grub.mo #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo diff --git a/lfs/grub b/lfs/grub index a054b8e..f7bce5d 100644 --- a/lfs/grub +++ b/lfs/grub @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.00 +VER = 2.02 THISAPP = grub-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,13 +41,13 @@ CXXFLAGS = ############################################################################### objects = $(DL_FILE) \ - unifont-7.0.03.pcf.gz + unifont-9.0.02.pcf.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz +unifont-9.0.02.pcf.gz = $(DL_FROM)/unifont-9.0.02.pcf.gz -$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91 -unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401 +$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3 +unifont-9.0.02.pcf.gz_MD5 = 8819d828361a6b70dcac793c1ec235bb install : $(TARGET) @@ -57,6 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) + ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -77,15 +78,14 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub2-remove-gets.patch cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --with-platform=pc \ --with-grubdir=grub \ + --disable-efiemu \ + --disable-grub-emu-usb \ --program-transform-name=s,grub,grub, \ --disable-grub-mount \ --disable-werror @@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters. /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \ --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \ - $(DIR_DL)/unifont-7.0.03.pcf.gz + $(DIR_DL)/unifont-9.0.02.pcf.gz @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch b/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch deleted file mode 100644 index 2eef1ae..0000000 --- a/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001 -From: Hector Marco-Gisbert <hecmargi(a)upv.es> -Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH] Fix security issue when reading username and password - - This patch fixes two integer underflows at: - * grub-core/lib/crypto.c - * grub-core/normal/auth.c - -Signed-off-by: Hector Marco-Gisbert <hecmargi(a)upv.es> -Signed-off-by: Ismael Ripoll-Ripoll <iripoll(a)disca.upv.es> ---- - grub-core/lib/crypto.c | 2 +- - grub-core/normal/auth.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index 010e550..524a3d8 100644 ---- a/grub-core/lib/crypto.c -+++ b/grub-core/lib/crypto.c -@@ -456,7 +456,7 @@ grub_password_get (char buf[], unsigned buf_size) - break; - } - -- if (key == '\b') -+ if (key == '\b' && cur_len) - { - cur_len--; - continue; -diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c -index c6bd96e..5782ec5 100644 ---- a/grub-core/normal/auth.c -+++ b/grub-core/normal/auth.c -@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size) - break; - } - -- if (key == '\b') -+ if (key == '\b' && cur_len) - { - cur_len--; - grub_printf ("\b"); --- -1.9.1 - diff --git a/src/patches/grub-2.00_disable_vga_fallback.patch b/src/patches/grub-2.00_disable_vga_fallback.patch deleted file mode 100644 index 0d1dec9..0000000 --- a/src/patches/grub-2.00_disable_vga_fallback.patch +++ /dev/null @@ -1,15 +0,0 @@ -We have to remove the vga fallback because this not work on bay-trail and other -new intel onboard graphics. - -diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-core/video/i386/pc/vga.c ---- grub-2.00.org/grub-core/video/i386/pc/vga.c 2012-06-06 23:21:02.000000000 +0200 -+++ grub-2.00/grub-core/video/i386/pc/vga.c 2014-09-05 21:41:04.790870375 +0200 -@@ -122,7 +122,7 @@ - { - grub_err_t err; - -- if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT)) -+// if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT)) - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found"); - - framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH); diff --git a/src/patches/grub2-remove-gets.patch b/src/patches/grub2-remove-gets.patch deleted file mode 100644 index 0da71b3..0000000 --- a/src/patches/grub2-remove-gets.patch +++ /dev/null @@ -1,21 +0,0 @@ -ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it - -Signed-off-by: Khem Raj <raj.khem(a)gmail.com> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> - -Upstream-Status: Pending -Index: grub-1.99/grub-core/gnulib/stdio.in.h -=================================================================== ---- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800 -+++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700 -@@ -140,8 +140,10 @@ - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -- 2.9.3

2 3

[PATCH] new package: pcre2 version 10.23
by Marcel Lorenz 15 Jun '17

15 Jun '17

http://www.pcre.org/ Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/pcre2 | 202 ++++++++++++++++++++++++++++++++++++++++++ lfs/pcre2 | 90 +++++++++++++++++++ make.sh | 1 + 3 files changed, 293 insertions(+) create mode 100644 config/rootfiles/common/pcre2 create mode 100644 lfs/pcre2 diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2 new file mode 100644 index 0000000..37e0268 --- /dev/null +++ b/config/rootfiles/common/pcre2 @@ -0,0 +1,202 @@ +usr/bin/pcre2-config +usr/bin/pcre2grep +#usr/bin/pcre2test +#usr/include/pcre2.h +#usr/include/pcre2posix.h +#usr/lib/libpcre2-16.la +usr/lib/libpcre2-16.so +usr/lib/libpcre2-16.so.0 +usr/lib/libpcre2-16.so.0.5.0 +#usr/lib/libpcre2-32.la +usr/lib/libpcre2-32.so +usr/lib/libpcre2-32.so.0 +usr/lib/libpcre2-32.so.0.5.0 +#usr/lib/libpcre2-8.la +usr/lib/libpcre2-8.so +usr/lib/libpcre2-8.so.0 +usr/lib/libpcre2-8.so.0.5.0 +#usr/lib/libpcre2-posix.la +usr/lib/libpcre2-posix.so +usr/lib/libpcre2-posix.so.1 +usr/lib/libpcre2-posix.so.1.0.1 +#usr/lib/pkgconfig/libpcre2-16.pc +#usr/lib/pkgconfig/libpcre2-32.pc +#usr/lib/pkgconfig/libpcre2-8.pc +#usr/lib/pkgconfig/libpcre2-posix.pc +#usr/share/doc/pcre2-pcre2-10.23 +#usr/share/doc/pcre2-pcre2-10.23/AUTHORS +#usr/share/doc/pcre2-pcre2-10.23/COPYING +#usr/share/doc/pcre2-pcre2-10.23/ChangeLog +#usr/share/doc/pcre2-pcre2-10.23/LICENCE +#usr/share/doc/pcre2-pcre2-10.23/NEWS +#usr/share/doc/pcre2-pcre2-10.23/README +#usr/share/doc/pcre2-pcre2-10.23/html +#usr/share/doc/pcre2-pcre2-10.23/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre2-pcre2-10.23/html/README.txt +#usr/share/doc/pcre2-pcre2-10.23/html/index.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2-config.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_callout_enumerate.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_code_copy.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_code_copy_with_tables.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_code_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_compile.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_compile_context_copy.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_compile_context_create.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_compile_context_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_config.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_dfa_match.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_general_context_copy.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_general_context_create.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_general_context_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_get_error_message.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_get_mark.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_get_ovector_count.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_get_ovector_pointer.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_get_startchar.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_compile.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_free_unused_memory.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_match.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_stack_assign.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_stack_create.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_jit_stack_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_maketables.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_context_copy.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_context_create.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_context_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_data_create.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_data_create_from_pattern.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_match_data_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_pattern_info.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_serialize_decode.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_serialize_encode.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_serialize_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_serialize_get_number_of_codes.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_bsr.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_callout.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_character_tables.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_compile_recursion_guard.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_match_limit.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_max_pattern_length.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_newline.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_offset_limit.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_parens_nest_limit.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_recursion_limit.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_set_recursion_memory_management.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substitute.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_copy_byname.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_copy_bynumber.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_get_byname.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_get_bynumber.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_length_byname.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_length_bynumber.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_list_free.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_list_get.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_nametable_scan.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2_substring_number_from_name.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2api.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2build.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2callout.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2compat.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2demo.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2grep.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2jit.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2limits.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2matching.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2partial.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2pattern.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2perform.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2posix.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2sample.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2serialize.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2stack.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2syntax.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2test.html +#usr/share/doc/pcre2-pcre2-10.23/html/pcre2unicode.html +#usr/share/doc/pcre2-pcre2-10.23/pcre2-config.txt +#usr/share/doc/pcre2-pcre2-10.23/pcre2.txt +#usr/share/doc/pcre2-pcre2-10.23/pcre2grep.txt +#usr/share/doc/pcre2-pcre2-10.23/pcre2test.txt +#usr/share/man/man1/pcre2-config.1 +#usr/share/man/man1/pcre2grep.1 +#usr/share/man/man1/pcre2test.1 +#usr/share/man/man3/pcre2.3 +#usr/share/man/man3/pcre2_callout_enumerate.3 +#usr/share/man/man3/pcre2_code_copy.3 +#usr/share/man/man3/pcre2_code_copy_with_tables.3 +#usr/share/man/man3/pcre2_code_free.3 +#usr/share/man/man3/pcre2_compile.3 +#usr/share/man/man3/pcre2_compile_context_copy.3 +#usr/share/man/man3/pcre2_compile_context_create.3 +#usr/share/man/man3/pcre2_compile_context_free.3 +#usr/share/man/man3/pcre2_config.3 +#usr/share/man/man3/pcre2_dfa_match.3 +#usr/share/man/man3/pcre2_general_context_copy.3 +#usr/share/man/man3/pcre2_general_context_create.3 +#usr/share/man/man3/pcre2_general_context_free.3 +#usr/share/man/man3/pcre2_get_error_message.3 +#usr/share/man/man3/pcre2_get_mark.3 +#usr/share/man/man3/pcre2_get_ovector_count.3 +#usr/share/man/man3/pcre2_get_ovector_pointer.3 +#usr/share/man/man3/pcre2_get_startchar.3 +#usr/share/man/man3/pcre2_jit_compile.3 +#usr/share/man/man3/pcre2_jit_free_unused_memory.3 +#usr/share/man/man3/pcre2_jit_match.3 +#usr/share/man/man3/pcre2_jit_stack_assign.3 +#usr/share/man/man3/pcre2_jit_stack_create.3 +#usr/share/man/man3/pcre2_jit_stack_free.3 +#usr/share/man/man3/pcre2_maketables.3 +#usr/share/man/man3/pcre2_match.3 +#usr/share/man/man3/pcre2_match_context_copy.3 +#usr/share/man/man3/pcre2_match_context_create.3 +#usr/share/man/man3/pcre2_match_context_free.3 +#usr/share/man/man3/pcre2_match_data_create.3 +#usr/share/man/man3/pcre2_match_data_create_from_pattern.3 +#usr/share/man/man3/pcre2_match_data_free.3 +#usr/share/man/man3/pcre2_pattern_info.3 +#usr/share/man/man3/pcre2_serialize_decode.3 +#usr/share/man/man3/pcre2_serialize_encode.3 +#usr/share/man/man3/pcre2_serialize_free.3 +#usr/share/man/man3/pcre2_serialize_get_number_of_codes.3 +#usr/share/man/man3/pcre2_set_bsr.3 +#usr/share/man/man3/pcre2_set_callout.3 +#usr/share/man/man3/pcre2_set_character_tables.3 +#usr/share/man/man3/pcre2_set_compile_recursion_guard.3 +#usr/share/man/man3/pcre2_set_match_limit.3 +#usr/share/man/man3/pcre2_set_max_pattern_length.3 +#usr/share/man/man3/pcre2_set_newline.3 +#usr/share/man/man3/pcre2_set_offset_limit.3 +#usr/share/man/man3/pcre2_set_parens_nest_limit.3 +#usr/share/man/man3/pcre2_set_recursion_limit.3 +#usr/share/man/man3/pcre2_set_recursion_memory_management.3 +#usr/share/man/man3/pcre2_substitute.3 +#usr/share/man/man3/pcre2_substring_copy_byname.3 +#usr/share/man/man3/pcre2_substring_copy_bynumber.3 +#usr/share/man/man3/pcre2_substring_free.3 +#usr/share/man/man3/pcre2_substring_get_byname.3 +#usr/share/man/man3/pcre2_substring_get_bynumber.3 +#usr/share/man/man3/pcre2_substring_length_byname.3 +#usr/share/man/man3/pcre2_substring_length_bynumber.3 +#usr/share/man/man3/pcre2_substring_list_free.3 +#usr/share/man/man3/pcre2_substring_list_get.3 +#usr/share/man/man3/pcre2_substring_nametable_scan.3 +#usr/share/man/man3/pcre2_substring_number_from_name.3 +#usr/share/man/man3/pcre2api.3 +#usr/share/man/man3/pcre2build.3 +#usr/share/man/man3/pcre2callout.3 +#usr/share/man/man3/pcre2compat.3 +#usr/share/man/man3/pcre2demo.3 +#usr/share/man/man3/pcre2jit.3 +#usr/share/man/man3/pcre2limits.3 +#usr/share/man/man3/pcre2matching.3 +#usr/share/man/man3/pcre2partial.3 +#usr/share/man/man3/pcre2pattern.3 +#usr/share/man/man3/pcre2perform.3 +#usr/share/man/man3/pcre2posix.3 +#usr/share/man/man3/pcre2sample.3 +#usr/share/man/man3/pcre2serialize.3 +#usr/share/man/man3/pcre2stack.3 +#usr/share/man/man3/pcre2syntax.3 +#usr/share/man/man3/pcre2unicode.3 diff --git a/lfs/pcre2 b/lfs/pcre2 new file mode 100644 index 0000000..7954382 --- /dev/null +++ b/lfs/pcre2 @@ -0,0 +1,90 @@ +############################################################################### +# # +# 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 = 10.23 + +THISAPP = pcre2-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 959c6645a4dc3f3200e7bf671b17f6af + +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) && ./configure \ + --prefix=/usr \ + --disable-static \ + --enable-jit \ + --enable-unicode \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libreadline \ + --docdir=/usr/share/doc/pcre2-$(THISAPP) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index a0f2dff..d3067cc 100755 --- a/make.sh +++ b/make.sh @@ -357,6 +357,7 @@ buildbase() { lfsmake2 readline-compat lfsmake2 bzip2 lfsmake2 pcre + lfsmake2 pcre2 lfsmake2 pcre-compat lfsmake2 bash lfsmake2 diffutils -- 2.9.3

2 1

[PATCH v2] lua: update to 5.3.4
by Marcel Lorenz 15 Jun '17

15 Jun '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/lua b/lfs/lua index 6a6a959..48f8a88 100644 --- a/lfs/lua +++ b/lfs/lua @@ -24,7 +24,7 @@ include Config -VER = 5.3.0 +VER = 5.3.4 THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a1b0a7e92d0c85bbff7a8d27bf29f8af +$(DL_FILE)_MD5 = 53a9c68bcc0eda58bdc2095ad5cdfc63 install : $(TARGET) -- 2.9.3

2 1

[PATCH] make.sh remove double build pcre
by Marcel Lorenz 15 Jun '17

15 Jun '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- make.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/make.sh b/make.sh index d3067cc..1921f87 100755 --- a/make.sh +++ b/make.sh @@ -527,7 +527,6 @@ buildipfire() { lfsmake2 libart lfsmake2 gd lfsmake2 popt - lfsmake2 pcre lfsmake2 slang lfsmake2 newt lfsmake2 libsmooth -- 2.9.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2017