From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 47b2640d3766786a12864fb295d41a20eaaa850e
Date: Wed, 09 Mar 2022 15:46:47 +0000 [thread overview]
Message-ID: <4KDGlX6CJHz2xwM@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 32318 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 47b2640d3766786a12864fb295d41a20eaaa850e (commit)
via 74659290e938e2fa3a006b6e8181042bedd5f76a (commit)
via 870c223e0f1ef7542ea01f2bb936dddb70b6cd36 (commit)
via cd3e5923fe9d6a562cd741c1dce13226ced33029 (commit)
via 5643fd8a9000f23123c03c652eec254263944f5c (commit)
via 7f8bb55a60fd72a6dcb03b566c442c344979ca4b (commit)
from 32ce7ab402ffe7cd93ea273af95d5f3d4791a612 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 47b2640d3766786a12864fb295d41a20eaaa850e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 9 15:12:32 2022 +0100
general-functions.pl: Do not die if no red interface could be determined.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 74659290e938e2fa3a006b6e8181042bedd5f76a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 9 15:12:31 2022 +0100
rules.pl: Do not create HOSTILE rules if no red dev is available.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 870c223e0f1ef7542ea01f2bb936dddb70b6cd36
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 9 15:12:30 2022 +0100
rules.pl: Adjust code to use sets generated by libloc 0.9.11
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cd3e5923fe9d6a562cd741c1dce13226ced33029
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 9 15:12:29 2022 +0100
libloc: Update to 0.9.11
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5643fd8a9000f23123c03c652eec254263944f5c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 27 09:16:21 2022 +0000
rtl8189fs: add realtek wlan driver
this chip is the successor of the rtl8189es look some boards has
silently switched to the new chip.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7f8bb55a60fd72a6dcb03b566c442c344979ca4b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 8 10:42:00 2022 +0000
core165: Ship hyperscan
This package is being built with a different configuration.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 15 +-
config/firewall/rules.pl | 47 +-
config/rootfiles/common/libloc | 516 ++++++++++-----------
.../133 => core/165}/filelists/x86_64/hyperscan | 0
lfs/libloc | 4 +-
lfs/{rtl8812au => rtl8189fs} | 15 +-
make.sh | 1 +
src/patches/rtl8189fs/disable_debug.patch | 11 +
8 files changed, 325 insertions(+), 284 deletions(-)
copy config/rootfiles/{oldcore/133 => core/165}/filelists/x86_64/hyperscan (100%)
copy lfs/{rtl8812au => rtl8189fs} (90%)
create mode 100644 src/patches/rtl8189fs/disable_debug.patch
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 5118a9d69..6f49585dc 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1228,12 +1228,15 @@ sub firewall_reload() {
# Function which will return the used interface for the red network zone (red0, ppp0, etc).
# if you change this also check speed.cgi that include a local copy for systemload reasons
sub get_red_interface() {
-
- open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipfire/red/iface";
-
- my $interface = <IFACE>;
- close(IFACE);
- chomp $interface;
+ my $interface;
+ my $red_iface_file = "${General::swroot}/red/iface";
+
+ if (-e $red_iface_file) {
+ open(IFACE, "$red_iface_file") or die "Could not open $red_iface_file";
+ $interface = <IFACE>;
+ close(IFACE);
+ chomp $interface;
+ }
return $interface;
}
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index b8c602538..57f4809b4 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -695,6 +695,9 @@ sub drop_hostile_networks () {
return;
}
+ # Exit if there is no red interface.
+ return unless($RED_DEV);
+
# Call function to load the network list of hostile networks.
&ipset_restore($HOSTILE_CCODE);
@@ -957,20 +960,44 @@ sub ipset_restore ($) {
# Check if the given set name is a country code.
if($set ~~ @locations) {
- # Libloc adds "ipset4" as prefix to all exported IPv4 data.
- my $file_prefix = "ipset4";
+ # Libloc adds the IP type (v4 or v6) as part of the set and file name.
+ my $loc_set = "$set" . "v4";
+
+ # The bare filename equals the set name.
+ my $filename = $loc_set;
+
+ # Libloc uses "ipset" as file extension.
+ my $file_extension = "ipset";
- # Generate full path and filename for the ipset db file to restore.
- $db_file = "$Location::Functions::ipset_db_directory/$set.$file_prefix";
+ # Generate full path and filename for the ipset db file.
+ my $db_file = "$Location::Functions::ipset_db_directory/$filename.$file_extension";
+
+ # Call function to restore/load the set.
+ &ipset_call_restore($db_file);
+
+ # Check if the set is already loaded (has been used before).
+ if ($set ~~ @ipset_used_sets) {
+ # The sets contains the IP type (v4 or v6) as part of the name.
+ # The firewall rules matches against sets without that extension. So we safely
+ # can swap or rename the sets to use the new ones.
+ run("$IPSET swap $loc_set $set");
+ } else {
+ # If the set is not loaded, we have to rename it to proper use it.
+ run("$IPSET rename $loc_set $set");
+ }
}
- # Check if the generated file exists.
- if (-f $db_file) {
- # Run ipset and restore the given set.
- run("$IPSET restore < $db_file");
+ # Store the restored set to the hash to prevent from loading it again.
+ $ipset_loaded_sets{$set} = "1";
+}
- # Store the restored set to the hash to prevent from loading it again.
- $ipset_loaded_sets{$set} = "1";
+sub ipset_call_restore ($) {
+ my ($file) = @_;
+
+ # Check if the requested file exists.
+ if (-f $file) {
+ # Run ipset and restore the given set.
+ run("$IPSET restore -f $file");
}
}
diff --git a/config/rootfiles/common/libloc b/config/rootfiles/common/libloc
index a87635912..c7335c7ef 100644
--- a/config/rootfiles/common/libloc
+++ b/config/rootfiles/common/libloc
@@ -39,262 +39,262 @@ usr/lib/python3.10/site-packages/location/logger.py
#var/lib/location
var/lib/location/database.db
var/lib/location/ipset
-var/lib/location/ipset/A1.ipset4
-var/lib/location/ipset/A2.ipset4
-var/lib/location/ipset/A3.ipset4
-var/lib/location/ipset/AD.ipset4
-var/lib/location/ipset/AE.ipset4
-var/lib/location/ipset/AF.ipset4
-var/lib/location/ipset/AG.ipset4
-var/lib/location/ipset/AI.ipset4
-var/lib/location/ipset/AL.ipset4
-var/lib/location/ipset/AM.ipset4
-var/lib/location/ipset/AN.ipset4
-var/lib/location/ipset/AO.ipset4
-var/lib/location/ipset/AP.ipset4
-var/lib/location/ipset/AQ.ipset4
-var/lib/location/ipset/AR.ipset4
-var/lib/location/ipset/AS.ipset4
-var/lib/location/ipset/AT.ipset4
-var/lib/location/ipset/AU.ipset4
-var/lib/location/ipset/AW.ipset4
-var/lib/location/ipset/AX.ipset4
-var/lib/location/ipset/AZ.ipset4
-var/lib/location/ipset/BA.ipset4
-var/lib/location/ipset/BB.ipset4
-var/lib/location/ipset/BD.ipset4
-var/lib/location/ipset/BE.ipset4
-var/lib/location/ipset/BF.ipset4
-var/lib/location/ipset/BG.ipset4
-var/lib/location/ipset/BH.ipset4
-var/lib/location/ipset/BI.ipset4
-var/lib/location/ipset/BJ.ipset4
-var/lib/location/ipset/BL.ipset4
-var/lib/location/ipset/BM.ipset4
-var/lib/location/ipset/BN.ipset4
-var/lib/location/ipset/BO.ipset4
-var/lib/location/ipset/BQ.ipset4
-var/lib/location/ipset/BR.ipset4
-var/lib/location/ipset/BS.ipset4
-var/lib/location/ipset/BT.ipset4
-var/lib/location/ipset/BV.ipset4
-var/lib/location/ipset/BW.ipset4
-var/lib/location/ipset/BY.ipset4
-var/lib/location/ipset/BZ.ipset4
-var/lib/location/ipset/CA.ipset4
-var/lib/location/ipset/CC.ipset4
-var/lib/location/ipset/CD.ipset4
-var/lib/location/ipset/CF.ipset4
-var/lib/location/ipset/CG.ipset4
-var/lib/location/ipset/CH.ipset4
-var/lib/location/ipset/CI.ipset4
-var/lib/location/ipset/CK.ipset4
-var/lib/location/ipset/CL.ipset4
-var/lib/location/ipset/CM.ipset4
-var/lib/location/ipset/CN.ipset4
-var/lib/location/ipset/CO.ipset4
-var/lib/location/ipset/CR.ipset4
-var/lib/location/ipset/CS.ipset4
-var/lib/location/ipset/CU.ipset4
-var/lib/location/ipset/CV.ipset4
-var/lib/location/ipset/CW.ipset4
-var/lib/location/ipset/CX.ipset4
-var/lib/location/ipset/CY.ipset4
-var/lib/location/ipset/CZ.ipset4
-var/lib/location/ipset/DE.ipset4
-var/lib/location/ipset/DJ.ipset4
-var/lib/location/ipset/DK.ipset4
-var/lib/location/ipset/DM.ipset4
-var/lib/location/ipset/DO.ipset4
-var/lib/location/ipset/DZ.ipset4
-var/lib/location/ipset/EC.ipset4
-var/lib/location/ipset/EE.ipset4
-var/lib/location/ipset/EG.ipset4
-var/lib/location/ipset/EH.ipset4
-var/lib/location/ipset/ER.ipset4
-var/lib/location/ipset/ES.ipset4
-var/lib/location/ipset/ET.ipset4
-var/lib/location/ipset/EU.ipset4
-var/lib/location/ipset/FI.ipset4
-var/lib/location/ipset/FJ.ipset4
-var/lib/location/ipset/FK.ipset4
-var/lib/location/ipset/FM.ipset4
-var/lib/location/ipset/FO.ipset4
-var/lib/location/ipset/FR.ipset4
-var/lib/location/ipset/FX.ipset4
-var/lib/location/ipset/GA.ipset4
-var/lib/location/ipset/GB.ipset4
-var/lib/location/ipset/GD.ipset4
-var/lib/location/ipset/GE.ipset4
-var/lib/location/ipset/GF.ipset4
-var/lib/location/ipset/GG.ipset4
-var/lib/location/ipset/GH.ipset4
-var/lib/location/ipset/GI.ipset4
-var/lib/location/ipset/GL.ipset4
-var/lib/location/ipset/GM.ipset4
-var/lib/location/ipset/GN.ipset4
-var/lib/location/ipset/GP.ipset4
-var/lib/location/ipset/GQ.ipset4
-var/lib/location/ipset/GR.ipset4
-var/lib/location/ipset/GS.ipset4
-var/lib/location/ipset/GT.ipset4
-var/lib/location/ipset/GU.ipset4
-var/lib/location/ipset/GW.ipset4
-var/lib/location/ipset/GY.ipset4
-var/lib/location/ipset/HK.ipset4
-var/lib/location/ipset/HM.ipset4
-var/lib/location/ipset/HN.ipset4
-var/lib/location/ipset/HR.ipset4
-var/lib/location/ipset/HT.ipset4
-var/lib/location/ipset/HU.ipset4
-var/lib/location/ipset/ID.ipset4
-var/lib/location/ipset/IE.ipset4
-var/lib/location/ipset/IL.ipset4
-var/lib/location/ipset/IM.ipset4
-var/lib/location/ipset/IN.ipset4
-var/lib/location/ipset/IO.ipset4
-var/lib/location/ipset/IQ.ipset4
-var/lib/location/ipset/IR.ipset4
-var/lib/location/ipset/IS.ipset4
-var/lib/location/ipset/IT.ipset4
-var/lib/location/ipset/JE.ipset4
-var/lib/location/ipset/JM.ipset4
-var/lib/location/ipset/JO.ipset4
-var/lib/location/ipset/JP.ipset4
-var/lib/location/ipset/KE.ipset4
-var/lib/location/ipset/KG.ipset4
-var/lib/location/ipset/KH.ipset4
-var/lib/location/ipset/KI.ipset4
-var/lib/location/ipset/KM.ipset4
-var/lib/location/ipset/KN.ipset4
-var/lib/location/ipset/KP.ipset4
-var/lib/location/ipset/KR.ipset4
-var/lib/location/ipset/KW.ipset4
-var/lib/location/ipset/KY.ipset4
-var/lib/location/ipset/KZ.ipset4
-var/lib/location/ipset/LA.ipset4
-var/lib/location/ipset/LB.ipset4
-var/lib/location/ipset/LC.ipset4
-var/lib/location/ipset/LI.ipset4
-var/lib/location/ipset/LK.ipset4
-var/lib/location/ipset/LR.ipset4
-var/lib/location/ipset/LS.ipset4
-var/lib/location/ipset/LT.ipset4
-var/lib/location/ipset/LU.ipset4
-var/lib/location/ipset/LV.ipset4
-var/lib/location/ipset/LY.ipset4
-var/lib/location/ipset/MA.ipset4
-var/lib/location/ipset/MC.ipset4
-var/lib/location/ipset/MD.ipset4
-var/lib/location/ipset/ME.ipset4
-var/lib/location/ipset/MF.ipset4
-var/lib/location/ipset/MG.ipset4
-var/lib/location/ipset/MH.ipset4
-var/lib/location/ipset/MK.ipset4
-var/lib/location/ipset/ML.ipset4
-var/lib/location/ipset/MM.ipset4
-var/lib/location/ipset/MN.ipset4
-var/lib/location/ipset/MO.ipset4
-var/lib/location/ipset/MP.ipset4
-var/lib/location/ipset/MQ.ipset4
-var/lib/location/ipset/MR.ipset4
-var/lib/location/ipset/MS.ipset4
-var/lib/location/ipset/MT.ipset4
-var/lib/location/ipset/MU.ipset4
-var/lib/location/ipset/MV.ipset4
-var/lib/location/ipset/MW.ipset4
-var/lib/location/ipset/MX.ipset4
-var/lib/location/ipset/MY.ipset4
-var/lib/location/ipset/MZ.ipset4
-var/lib/location/ipset/NA.ipset4
-var/lib/location/ipset/NC.ipset4
-var/lib/location/ipset/NE.ipset4
-var/lib/location/ipset/NF.ipset4
-var/lib/location/ipset/NG.ipset4
-var/lib/location/ipset/NI.ipset4
-var/lib/location/ipset/NL.ipset4
-var/lib/location/ipset/NO.ipset4
-var/lib/location/ipset/NP.ipset4
-var/lib/location/ipset/NR.ipset4
-var/lib/location/ipset/NU.ipset4
-var/lib/location/ipset/NZ.ipset4
-var/lib/location/ipset/OM.ipset4
-var/lib/location/ipset/PA.ipset4
-var/lib/location/ipset/PE.ipset4
-var/lib/location/ipset/PF.ipset4
-var/lib/location/ipset/PG.ipset4
-var/lib/location/ipset/PH.ipset4
-var/lib/location/ipset/PK.ipset4
-var/lib/location/ipset/PL.ipset4
-var/lib/location/ipset/PM.ipset4
-var/lib/location/ipset/PN.ipset4
-var/lib/location/ipset/PR.ipset4
-var/lib/location/ipset/PS.ipset4
-var/lib/location/ipset/PT.ipset4
-var/lib/location/ipset/PW.ipset4
-var/lib/location/ipset/PY.ipset4
-var/lib/location/ipset/QA.ipset4
-var/lib/location/ipset/RE.ipset4
-var/lib/location/ipset/RO.ipset4
-var/lib/location/ipset/RS.ipset4
-var/lib/location/ipset/RU.ipset4
-var/lib/location/ipset/RW.ipset4
-var/lib/location/ipset/SA.ipset4
-var/lib/location/ipset/SB.ipset4
-var/lib/location/ipset/SC.ipset4
-var/lib/location/ipset/SD.ipset4
-var/lib/location/ipset/SE.ipset4
-var/lib/location/ipset/SG.ipset4
-var/lib/location/ipset/SH.ipset4
-var/lib/location/ipset/SI.ipset4
-var/lib/location/ipset/SJ.ipset4
-var/lib/location/ipset/SK.ipset4
-var/lib/location/ipset/SL.ipset4
-var/lib/location/ipset/SM.ipset4
-var/lib/location/ipset/SN.ipset4
-var/lib/location/ipset/SO.ipset4
-var/lib/location/ipset/SR.ipset4
-var/lib/location/ipset/SS.ipset4
-var/lib/location/ipset/ST.ipset4
-var/lib/location/ipset/SV.ipset4
-var/lib/location/ipset/SX.ipset4
-var/lib/location/ipset/SY.ipset4
-var/lib/location/ipset/SZ.ipset4
-var/lib/location/ipset/TC.ipset4
-var/lib/location/ipset/TD.ipset4
-var/lib/location/ipset/TF.ipset4
-var/lib/location/ipset/TG.ipset4
-var/lib/location/ipset/TH.ipset4
-var/lib/location/ipset/TJ.ipset4
-var/lib/location/ipset/TK.ipset4
-var/lib/location/ipset/TL.ipset4
-var/lib/location/ipset/TM.ipset4
-var/lib/location/ipset/TN.ipset4
-var/lib/location/ipset/TO.ipset4
-var/lib/location/ipset/TR.ipset4
-var/lib/location/ipset/TT.ipset4
-var/lib/location/ipset/TV.ipset4
-var/lib/location/ipset/TW.ipset4
-var/lib/location/ipset/TZ.ipset4
-var/lib/location/ipset/UA.ipset4
-var/lib/location/ipset/UG.ipset4
-var/lib/location/ipset/UM.ipset4
-var/lib/location/ipset/US.ipset4
-var/lib/location/ipset/UY.ipset4
-var/lib/location/ipset/UZ.ipset4
-var/lib/location/ipset/VA.ipset4
-var/lib/location/ipset/VC.ipset4
-var/lib/location/ipset/VE.ipset4
-var/lib/location/ipset/VG.ipset4
-var/lib/location/ipset/VI.ipset4
-var/lib/location/ipset/VN.ipset4
-var/lib/location/ipset/VU.ipset4
-var/lib/location/ipset/WF.ipset4
-var/lib/location/ipset/WS.ipset4
-var/lib/location/ipset/XD.ipset4
-var/lib/location/ipset/YE.ipset4
-var/lib/location/ipset/YT.ipset4
-var/lib/location/ipset/ZA.ipset4
-var/lib/location/ipset/ZM.ipset4
-var/lib/location/ipset/ZW.ipset4
+var/lib/location/ipset/A1v4.ipset
+var/lib/location/ipset/A2v4.ipset
+var/lib/location/ipset/A3v4.ipset
+var/lib/location/ipset/ADv4.ipset
+var/lib/location/ipset/AEv4.ipset
+var/lib/location/ipset/AFv4.ipset
+var/lib/location/ipset/AGv4.ipset
+var/lib/location/ipset/AIv4.ipset
+var/lib/location/ipset/ALv4.ipset
+var/lib/location/ipset/AMv4.ipset
+var/lib/location/ipset/ANv4.ipset
+var/lib/location/ipset/AOv4.ipset
+var/lib/location/ipset/APv4.ipset
+var/lib/location/ipset/AQv4.ipset
+var/lib/location/ipset/ARv4.ipset
+var/lib/location/ipset/ASv4.ipset
+var/lib/location/ipset/ATv4.ipset
+var/lib/location/ipset/AUv4.ipset
+var/lib/location/ipset/AWv4.ipset
+var/lib/location/ipset/AXv4.ipset
+var/lib/location/ipset/AZv4.ipset
+var/lib/location/ipset/BAv4.ipset
+var/lib/location/ipset/BBv4.ipset
+var/lib/location/ipset/BDv4.ipset
+var/lib/location/ipset/BEv4.ipset
+var/lib/location/ipset/BFv4.ipset
+var/lib/location/ipset/BGv4.ipset
+var/lib/location/ipset/BHv4.ipset
+var/lib/location/ipset/BIv4.ipset
+var/lib/location/ipset/BJv4.ipset
+var/lib/location/ipset/BLv4.ipset
+var/lib/location/ipset/BMv4.ipset
+var/lib/location/ipset/BNv4.ipset
+var/lib/location/ipset/BOv4.ipset
+var/lib/location/ipset/BQv4.ipset
+var/lib/location/ipset/BRv4.ipset
+var/lib/location/ipset/BSv4.ipset
+var/lib/location/ipset/BTv4.ipset
+var/lib/location/ipset/BVv4.ipset
+var/lib/location/ipset/BWv4.ipset
+var/lib/location/ipset/BYv4.ipset
+var/lib/location/ipset/BZv4.ipset
+var/lib/location/ipset/CAv4.ipset
+var/lib/location/ipset/CCv4.ipset
+var/lib/location/ipset/CDv4.ipset
+var/lib/location/ipset/CFv4.ipset
+var/lib/location/ipset/CGv4.ipset
+var/lib/location/ipset/CHv4.ipset
+var/lib/location/ipset/CIv4.ipset
+var/lib/location/ipset/CKv4.ipset
+var/lib/location/ipset/CLv4.ipset
+var/lib/location/ipset/CMv4.ipset
+var/lib/location/ipset/CNv4.ipset
+var/lib/location/ipset/COv4.ipset
+var/lib/location/ipset/CRv4.ipset
+var/lib/location/ipset/CSv4.ipset
+var/lib/location/ipset/CUv4.ipset
+var/lib/location/ipset/CVv4.ipset
+var/lib/location/ipset/CWv4.ipset
+var/lib/location/ipset/CXv4.ipset
+var/lib/location/ipset/CYv4.ipset
+var/lib/location/ipset/CZv4.ipset
+var/lib/location/ipset/DEv4.ipset
+var/lib/location/ipset/DJv4.ipset
+var/lib/location/ipset/DKv4.ipset
+var/lib/location/ipset/DMv4.ipset
+var/lib/location/ipset/DOv4.ipset
+var/lib/location/ipset/DZv4.ipset
+var/lib/location/ipset/ECv4.ipset
+var/lib/location/ipset/EEv4.ipset
+var/lib/location/ipset/EGv4.ipset
+var/lib/location/ipset/EHv4.ipset
+var/lib/location/ipset/ERv4.ipset
+var/lib/location/ipset/ESv4.ipset
+var/lib/location/ipset/ETv4.ipset
+var/lib/location/ipset/EUv4.ipset
+var/lib/location/ipset/FIv4.ipset
+var/lib/location/ipset/FJv4.ipset
+var/lib/location/ipset/FKv4.ipset
+var/lib/location/ipset/FMv4.ipset
+var/lib/location/ipset/FOv4.ipset
+var/lib/location/ipset/FRv4.ipset
+var/lib/location/ipset/FXv4.ipset
+var/lib/location/ipset/GAv4.ipset
+var/lib/location/ipset/GBv4.ipset
+var/lib/location/ipset/GDv4.ipset
+var/lib/location/ipset/GEv4.ipset
+var/lib/location/ipset/GFv4.ipset
+var/lib/location/ipset/GGv4.ipset
+var/lib/location/ipset/GHv4.ipset
+var/lib/location/ipset/GIv4.ipset
+var/lib/location/ipset/GLv4.ipset
+var/lib/location/ipset/GMv4.ipset
+var/lib/location/ipset/GNv4.ipset
+var/lib/location/ipset/GPv4.ipset
+var/lib/location/ipset/GQv4.ipset
+var/lib/location/ipset/GRv4.ipset
+var/lib/location/ipset/GSv4.ipset
+var/lib/location/ipset/GTv4.ipset
+var/lib/location/ipset/GUv4.ipset
+var/lib/location/ipset/GWv4.ipset
+var/lib/location/ipset/GYv4.ipset
+var/lib/location/ipset/HKv4.ipset
+var/lib/location/ipset/HMv4.ipset
+var/lib/location/ipset/HNv4.ipset
+var/lib/location/ipset/HRv4.ipset
+var/lib/location/ipset/HTv4.ipset
+var/lib/location/ipset/HUv4.ipset
+var/lib/location/ipset/IDv4.ipset
+var/lib/location/ipset/IEv4.ipset
+var/lib/location/ipset/ILv4.ipset
+var/lib/location/ipset/IMv4.ipset
+var/lib/location/ipset/INv4.ipset
+var/lib/location/ipset/IOv4.ipset
+var/lib/location/ipset/IQv4.ipset
+var/lib/location/ipset/IRv4.ipset
+var/lib/location/ipset/ISv4.ipset
+var/lib/location/ipset/ITv4.ipset
+var/lib/location/ipset/JEv4.ipset
+var/lib/location/ipset/JMv4.ipset
+var/lib/location/ipset/JOv4.ipset
+var/lib/location/ipset/JPv4.ipset
+var/lib/location/ipset/KEv4.ipset
+var/lib/location/ipset/KGv4.ipset
+var/lib/location/ipset/KHv4.ipset
+var/lib/location/ipset/KIv4.ipset
+var/lib/location/ipset/KMv4.ipset
+var/lib/location/ipset/KNv4.ipset
+var/lib/location/ipset/KPv4.ipset
+var/lib/location/ipset/KRv4.ipset
+var/lib/location/ipset/KWv4.ipset
+var/lib/location/ipset/KYv4.ipset
+var/lib/location/ipset/KZv4.ipset
+var/lib/location/ipset/LAv4.ipset
+var/lib/location/ipset/LBv4.ipset
+var/lib/location/ipset/LCv4.ipset
+var/lib/location/ipset/LIv4.ipset
+var/lib/location/ipset/LKv4.ipset
+var/lib/location/ipset/LRv4.ipset
+var/lib/location/ipset/LSv4.ipset
+var/lib/location/ipset/LTv4.ipset
+var/lib/location/ipset/LUv4.ipset
+var/lib/location/ipset/LVv4.ipset
+var/lib/location/ipset/LYv4.ipset
+var/lib/location/ipset/MAv4.ipset
+var/lib/location/ipset/MCv4.ipset
+var/lib/location/ipset/MDv4.ipset
+var/lib/location/ipset/MEv4.ipset
+var/lib/location/ipset/MFv4.ipset
+var/lib/location/ipset/MGv4.ipset
+var/lib/location/ipset/MHv4.ipset
+var/lib/location/ipset/MKv4.ipset
+var/lib/location/ipset/MLv4.ipset
+var/lib/location/ipset/MMv4.ipset
+var/lib/location/ipset/MNv4.ipset
+var/lib/location/ipset/MOv4.ipset
+var/lib/location/ipset/MPv4.ipset
+var/lib/location/ipset/MQv4.ipset
+var/lib/location/ipset/MRv4.ipset
+var/lib/location/ipset/MSv4.ipset
+var/lib/location/ipset/MTv4.ipset
+var/lib/location/ipset/MUv4.ipset
+var/lib/location/ipset/MVv4.ipset
+var/lib/location/ipset/MWv4.ipset
+var/lib/location/ipset/MXv4.ipset
+var/lib/location/ipset/MYv4.ipset
+var/lib/location/ipset/MZv4.ipset
+var/lib/location/ipset/NAv4.ipset
+var/lib/location/ipset/NCv4.ipset
+var/lib/location/ipset/NEv4.ipset
+var/lib/location/ipset/NFv4.ipset
+var/lib/location/ipset/NGv4.ipset
+var/lib/location/ipset/NIv4.ipset
+var/lib/location/ipset/NLv4.ipset
+var/lib/location/ipset/NOv4.ipset
+var/lib/location/ipset/NPv4.ipset
+var/lib/location/ipset/NRv4.ipset
+var/lib/location/ipset/NUv4.ipset
+var/lib/location/ipset/NZv4.ipset
+var/lib/location/ipset/OMv4.ipset
+var/lib/location/ipset/PAv4.ipset
+var/lib/location/ipset/PEv4.ipset
+var/lib/location/ipset/PFv4.ipset
+var/lib/location/ipset/PGv4.ipset
+var/lib/location/ipset/PHv4.ipset
+var/lib/location/ipset/PKv4.ipset
+var/lib/location/ipset/PLv4.ipset
+var/lib/location/ipset/PMv4.ipset
+var/lib/location/ipset/PNv4.ipset
+var/lib/location/ipset/PRv4.ipset
+var/lib/location/ipset/PSv4.ipset
+var/lib/location/ipset/PTv4.ipset
+var/lib/location/ipset/PWv4.ipset
+var/lib/location/ipset/PYv4.ipset
+var/lib/location/ipset/QAv4.ipset
+var/lib/location/ipset/REv4.ipset
+var/lib/location/ipset/ROv4.ipset
+var/lib/location/ipset/RSv4.ipset
+var/lib/location/ipset/RUv4.ipset
+var/lib/location/ipset/RWv4.ipset
+var/lib/location/ipset/SAv4.ipset
+var/lib/location/ipset/SBv4.ipset
+var/lib/location/ipset/SCv4.ipset
+var/lib/location/ipset/SDv4.ipset
+var/lib/location/ipset/SEv4.ipset
+var/lib/location/ipset/SGv4.ipset
+var/lib/location/ipset/SHv4.ipset
+var/lib/location/ipset/SIv4.ipset
+var/lib/location/ipset/SJv4.ipset
+var/lib/location/ipset/SKv4.ipset
+var/lib/location/ipset/SLv4.ipset
+var/lib/location/ipset/SMv4.ipset
+var/lib/location/ipset/SNv4.ipset
+var/lib/location/ipset/SOv4.ipset
+var/lib/location/ipset/SRv4.ipset
+var/lib/location/ipset/SSv4.ipset
+var/lib/location/ipset/STv4.ipset
+var/lib/location/ipset/SVv4.ipset
+var/lib/location/ipset/SXv4.ipset
+var/lib/location/ipset/SYv4.ipset
+var/lib/location/ipset/SZv4.ipset
+var/lib/location/ipset/TCv4.ipset
+var/lib/location/ipset/TDv4.ipset
+var/lib/location/ipset/TFv4.ipset
+var/lib/location/ipset/TGv4.ipset
+var/lib/location/ipset/THv4.ipset
+var/lib/location/ipset/TJv4.ipset
+var/lib/location/ipset/TKv4.ipset
+var/lib/location/ipset/TLv4.ipset
+var/lib/location/ipset/TMv4.ipset
+var/lib/location/ipset/TNv4.ipset
+var/lib/location/ipset/TOv4.ipset
+var/lib/location/ipset/TRv4.ipset
+var/lib/location/ipset/TTv4.ipset
+var/lib/location/ipset/TVv4.ipset
+var/lib/location/ipset/TWv4.ipset
+var/lib/location/ipset/TZv4.ipset
+var/lib/location/ipset/UAv4.ipset
+var/lib/location/ipset/UGv4.ipset
+var/lib/location/ipset/UMv4.ipset
+var/lib/location/ipset/USv4.ipset
+var/lib/location/ipset/UYv4.ipset
+var/lib/location/ipset/UZv4.ipset
+var/lib/location/ipset/VAv4.ipset
+var/lib/location/ipset/VCv4.ipset
+var/lib/location/ipset/VEv4.ipset
+var/lib/location/ipset/VGv4.ipset
+var/lib/location/ipset/VIv4.ipset
+var/lib/location/ipset/VNv4.ipset
+var/lib/location/ipset/VUv4.ipset
+var/lib/location/ipset/WFv4.ipset
+var/lib/location/ipset/WSv4.ipset
+var/lib/location/ipset/XDv4.ipset
+var/lib/location/ipset/YEv4.ipset
+var/lib/location/ipset/YTv4.ipset
+var/lib/location/ipset/ZAv4.ipset
+var/lib/location/ipset/ZMv4.ipset
+var/lib/location/ipset/ZWv4.ipset
var/lib/location/signing-key.pem
diff --git a/config/rootfiles/core/165/filelists/x86_64/hyperscan b/config/rootfiles/core/165/filelists/x86_64/hyperscan
new file mode 120000
index 000000000..ee1858dca
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/x86_64/hyperscan
@@ -0,0 +1 @@
+../../../../common/x86_64/hyperscan
\ No newline at end of file
diff --git a/lfs/libloc b/lfs/libloc
index 29008191a..b94906c94 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -24,7 +24,7 @@
include Config
-VER = 0.9.10
+VER = 0.9.11
DB_DATE = 2022-02-16
THISAPP = libloc-$(VER)
@@ -43,7 +43,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE)
location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz
-$(DL_FILE)_MD5 = 3f67e15022c142c0731cbb3746351330
+$(DL_FILE)_MD5 = 724ce9081a025307528021e6398c9335
location-$(DB_DATE).db.xz_MD5 = c1ad9c544bab917035eb0cd13b66c453
install : $(TARGET)
diff --git a/lfs/rtl8189fs b/lfs/rtl8189fs
new file mode 100644
index 000000000..7a2b3dca0
--- /dev/null
+++ b/lfs/rtl8189fs
@@ -0,0 +1,95 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2022 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
+
+VERSUFIX = ipfire$(KCFG)
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/wlan
+
+VER = 3129a665f835ce0342f9a85a0ce14a556e656b8c
+
+THISAPP = rtl8189FS_linux-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f7c817e89403b8a84a664f326f47c7d7
+
+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) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8189fs/disable_debug.patch
+ cd $(DIR_APP) && CONFIG_RTL8189FS=m make $(MAKETUNING) \
+ -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
+
+ # Install the built kernel modules.
+ mkdir -p $(MODPATH)
+ cd $(DIR_APP) && for f in $$(ls *.ko); do \
+ /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
+ /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
+ /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
+ $$f; \
+ xz $$f; \
+ install -m 644 $$f.xz $(MODPATH); \
+ done
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 054827bad..fda7ca1c4 100755
--- a/make.sh
+++ b/make.sh
@@ -1195,6 +1195,7 @@ buildipfire() {
# multi kernel builds so KCFG is empty
lfsmake2 linux KCFG=""
lfsmake2 rtl8189es KCFG=""
+ lfsmake2 rtl8189fs KCFG=""
lfsmake2 rtl8812au KCFG=""
lfsmake2 rtl8822bu KCFG=""
lfsmake2 xradio KCFG=""
diff --git a/src/patches/rtl8189fs/disable_debug.patch b/src/patches/rtl8189fs/disable_debug.patch
new file mode 100644
index 000000000..d29c55e6c
--- /dev/null
+++ b/src/patches/rtl8189fs/disable_debug.patch
@@ -0,0 +1,11 @@
+diff -Naur rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c.org/include/autoconf.h rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c/include/autoconf.h
+--- rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c.org/include/autoconf.h 2021-10-01 14:51:56.000000000 +0000
++++ rtl8189FS_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c/include/autoconf.h 2022-02-26 12:00:09.188965578 +0000
+@@ -224,7 +224,6 @@
+ /*
+ * Debug Related Config
+ */
+-#define CONFIG_DEBUG /* DBG_871X, etc... */
+
+ #ifdef CONFIG_DEBUG
+ #define DBG 1 // for ODM & BTCOEX debug
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2022-03-09 15:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4KDGlX6CJHz2xwM@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox