- crda only works with python2 version of m2crypto python-m2crypto requires python-setuptools and python-typing - With Linux kernel 4.15 and later the country code status check that crda did is built into the kernel. - So from kernel 4.15, crda can be removed, which allows removal of m2crypto, setuptools and typing. - python-typing is built into python3 so no additional python3 module required. - python3 version of python-setuptools has already been installed. - python3 version of python-m2crypto is not required. python-m2crypto is only used for the build of crda. - ipaddr can be removed as the function of this python2 module is built into python3 with ipaddress.py - removal of crda tested with 5.10.45 kernel and the setting of a country code was recognised. If this test carried out with crda removed and 4.14.232 kernel then country code stays defined as the global code "00".
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- make.sh | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/make.sh b/make.sh index fc03ebcd5..f8767bad9 100755 --- a/make.sh +++ b/make.sh @@ -1307,7 +1307,6 @@ buildipfire() { lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools - lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols lfsmake2 hwdata @@ -1344,7 +1343,6 @@ buildipfire() { lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet - lfsmake2 python-setuptools lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils @@ -1527,10 +1525,7 @@ buildipfire() { lfsmake2 swig lfsmake2 u-boot lfsmake2 u-boot-friendlyarm - lfsmake2 python-typing - lfsmake2 python-m2crypto lfsmake2 wireless-regdb - lfsmake2 crda lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-setuptools-scm
- From kernel 4.15 and onwards the function of what crda does is built into the kernel. - Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45 Country code set by "iw reg set NL" was recognised with kernel 5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14 - -THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD)
- A python3 version of this module is not required as python-m2crypto is only used for the build of crda.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/python-m2crypto | 98 ------------------------- lfs/python-m2crypto | 83 --------------------- 2 files changed, 181 deletions(-) delete mode 100644 config/rootfiles/common/python-m2crypto delete mode 100644 lfs/python-m2crypto
diff --git a/config/rootfiles/common/python-m2crypto b/config/rootfiles/common/python-m2crypto deleted file mode 100644 index c5477cda3..000000000 --- a/config/rootfiles/common/python-m2crypto +++ /dev/null @@ -1,98 +0,0 @@ -#usr/lib/python2.7/site-packages/M2Crypto -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/PKG-INFO -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/SOURCES.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/dependency_links.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/requires.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/top_level.txt -#usr/lib/python2.7/site-packages/M2Crypto/ASN1.py -#usr/lib/python2.7/site-packages/M2Crypto/ASN1.pyc -#usr/lib/python2.7/site-packages/M2Crypto/AuthCookie.py -#usr/lib/python2.7/site-packages/M2Crypto/AuthCookie.pyc -#usr/lib/python2.7/site-packages/M2Crypto/BIO.py -#usr/lib/python2.7/site-packages/M2Crypto/BIO.pyc -#usr/lib/python2.7/site-packages/M2Crypto/BN.py -#usr/lib/python2.7/site-packages/M2Crypto/BN.pyc -#usr/lib/python2.7/site-packages/M2Crypto/DH.py -#usr/lib/python2.7/site-packages/M2Crypto/DH.pyc -#usr/lib/python2.7/site-packages/M2Crypto/DSA.py -#usr/lib/python2.7/site-packages/M2Crypto/DSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/EC.py -#usr/lib/python2.7/site-packages/M2Crypto/EC.pyc -#usr/lib/python2.7/site-packages/M2Crypto/EVP.py -#usr/lib/python2.7/site-packages/M2Crypto/EVP.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Engine.py -#usr/lib/python2.7/site-packages/M2Crypto/Engine.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Err.py -#usr/lib/python2.7/site-packages/M2Crypto/Err.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKey.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKey.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKeyRing.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKeyRing.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/RSA.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/RSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/constants.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/constants.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/packet.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/packet.pyc -#usr/lib/python2.7/site-packages/M2Crypto/RC4.py -#usr/lib/python2.7/site-packages/M2Crypto/RC4.pyc -#usr/lib/python2.7/site-packages/M2Crypto/RSA.py -#usr/lib/python2.7/site-packages/M2Crypto/RSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Rand.py -#usr/lib/python2.7/site-packages/M2Crypto/Rand.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SMIME.py -#usr/lib/python2.7/site-packages/M2Crypto/SMIME.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Checker.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Checker.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Cipher.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Cipher.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Connection.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Connection.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Context.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Context.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/SSLServer.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/SSLServer.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Session.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Session.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/TwistedProtocolWrapper.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/TwistedProtocolWrapper.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/cb.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/cb.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/ssl_dispatcher.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/ssl_dispatcher.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/timeout.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/timeout.pyc -#usr/lib/python2.7/site-packages/M2Crypto/X509.py -#usr/lib/python2.7/site-packages/M2Crypto/X509.pyc -#usr/lib/python2.7/site-packages/M2Crypto/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/_m2crypto.so -#usr/lib/python2.7/site-packages/M2Crypto/callback.py -#usr/lib/python2.7/site-packages/M2Crypto/callback.pyc -#usr/lib/python2.7/site-packages/M2Crypto/ftpslib.py -#usr/lib/python2.7/site-packages/M2Crypto/ftpslib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/httpslib.py -#usr/lib/python2.7/site-packages/M2Crypto/httpslib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2.py -#usr/lib/python2.7/site-packages/M2Crypto/m2.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2crypto.py -#usr/lib/python2.7/site-packages/M2Crypto/m2crypto.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib.py -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib2.py -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib2.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2xmlrpclib.py -#usr/lib/python2.7/site-packages/M2Crypto/m2xmlrpclib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/six.py -#usr/lib/python2.7/site-packages/M2Crypto/six.pyc -#usr/lib/python2.7/site-packages/M2Crypto/threading.py -#usr/lib/python2.7/site-packages/M2Crypto/threading.pyc -#usr/lib/python2.7/site-packages/M2Crypto/util.py -#usr/lib/python2.7/site-packages/M2Crypto/util.pyc diff --git a/lfs/python-m2crypto b/lfs/python-m2crypto deleted file mode 100644 index de004bfd9..000000000 --- a/lfs/python-m2crypto +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 0.27.0 - -THISAPP = M2Crypto-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -#PROG = python-m2crypto -#PAK_VER = 1 - -#DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 4477bd6b2835560c73982476dba5e515 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -#dist: -# @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py build - cd $(DIR_APP) && python setup.py install --root=/ - @rm -rf $(DIR_APP) - @$(POSTBUILD)
- With the removal of python-m2crypto then python-typing is no longer rerquired as a dependency. - The functionality of the python2 typing module is built in to python3.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/python-typing | 3 - lfs/python-typing | 79 --------------------------- 2 files changed, 82 deletions(-) delete mode 100644 config/rootfiles/common/python-typing delete mode 100644 lfs/python-typing
diff --git a/config/rootfiles/common/python-typing b/config/rootfiles/common/python-typing deleted file mode 100644 index 519796ca4..000000000 --- a/config/rootfiles/common/python-typing +++ /dev/null @@ -1,3 +0,0 @@ -#usr/lib/python2.7/site-packages/typing-3.6.1-py2.7.egg-info -#usr/lib/python2.7/site-packages/typing.py -#usr/lib/python2.7/site-packages/typing.pyc diff --git a/lfs/python-typing b/lfs/python-typing deleted file mode 100644 index d7bbe412b..000000000 --- a/lfs/python-typing +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 3.6.1 - -THISAPP = typing-$(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 = 3fec97415bae6f742fb3c3013dedeb89 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -#dist: -# @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py build - cd $(DIR_APP) && python setup.py install --skip-build - @rm -rf $(DIR_APP) - @$(POSTBUILD)
- With the removal of python-m2crypto then this module is not longer required as a dependency. - python3-setuptools was already released into Core Update 157
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/python-setuptools | 5 -- lfs/python-setuptools | 80 ----------------------- 2 files changed, 85 deletions(-) delete mode 100644 config/rootfiles/common/python-setuptools delete mode 100644 lfs/python-setuptools
diff --git a/config/rootfiles/common/python-setuptools b/config/rootfiles/common/python-setuptools deleted file mode 100644 index 15b22ac39..000000000 --- a/config/rootfiles/common/python-setuptools +++ /dev/null @@ -1,5 +0,0 @@ -#usr/bin/easy_install -#usr/bin/easy_install-2.7 -#usr/lib/python2.7/site-packages/easy-install.pth -#usr/lib/python2.7/site-packages/setuptools-0.6c11-py2.7.egg -#usr/lib/python2.7/site-packages/setuptools.pth diff --git a/lfs/python-setuptools b/lfs/python-setuptools deleted file mode 100644 index 1ffcfca18..000000000 --- a/lfs/python-setuptools +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 0.6c11 - -THISAPP = setuptools-$(VER) -DL_FILE = $(THISAPP)-py2.7.egg -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-setuptools -PAK_VER = 2 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = fe1f997bc722265116870bc7919059ea - -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) - bash $(DIR_DL)/$(DL_FILE) - @$(POSTBUILD)
- python3 has this functionality built in with ipaddress.py
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/ipaddr | 2 - lfs/ipaddr | 76 ---------------------------------- 2 files changed, 78 deletions(-) delete mode 100644 config/rootfiles/common/ipaddr delete mode 100644 lfs/ipaddr
diff --git a/config/rootfiles/common/ipaddr b/config/rootfiles/common/ipaddr deleted file mode 100644 index 17998ccc2..000000000 --- a/config/rootfiles/common/ipaddr +++ /dev/null @@ -1,2 +0,0 @@ -#usr/lib/python2.7/ipaddr.py -usr/lib/python2.7/ipaddr.pyc diff --git a/lfs/ipaddr b/lfs/ipaddr deleted file mode 100644 index d5d28229b..000000000 --- a/lfs/ipaddr +++ /dev/null @@ -1,76 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 1.2 - -THISAPP = ipaddr-$(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 = 239a3725a3dd6a1d1e369b75144e617e - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python2* - /usr/bin/python -c "import ipaddr" - @rm -rf $(DIR_APP) - @$(POSTBUILD)
Hello,
I can ack this, that we can drop CRDA entirely. We only need to keep the wireless-regdb.
Acked-by: Michael Tremer michael.tremer@ipfire.org
I cannot think of anything that would use the dropped Python modules.
Great work Adolf!
Best, -Michael
On 28 Jun 2021, at 20:13, Adolf Belka adolf.belka@ipfire.org wrote:
- crda only works with python2 version of m2crypto python-m2crypto requires python-setuptools and python-typing
- With Linux kernel 4.15 and later the country code status check that crda did is built into the kernel.
- So from kernel 4.15, crda can be removed, which allows removal of m2crypto, setuptools and typing.
- python-typing is built into python3 so no additional python3 module required.
- python3 version of python-setuptools has already been installed.
- python3 version of python-m2crypto is not required. python-m2crypto is only used for the build of crda.
- ipaddr can be removed as the function of this python2 module is built into python3 with ipaddress.py
- removal of crda tested with 5.10.45 kernel and the setting of a country code was recognised. If this test carried out with crda removed and 4.14.232 kernel then country code stays defined as the global code "00".
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
make.sh | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/make.sh b/make.sh index fc03ebcd5..f8767bad9 100755 --- a/make.sh +++ b/make.sh @@ -1307,7 +1307,6 @@ buildipfire() { lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools
- lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols lfsmake2 hwdata
@@ -1344,7 +1343,6 @@ buildipfire() { lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet
- lfsmake2 python-setuptools lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils
@@ -1527,10 +1525,7 @@ buildipfire() { lfsmake2 swig lfsmake2 u-boot lfsmake2 u-boot-friendlyarm
- lfsmake2 python-typing
- lfsmake2 python-m2crypto lfsmake2 wireless-regdb
- lfsmake2 crda lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-setuptools-scm
-- 2.32.0
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is built
into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45 Country code set by "iw reg set NL" was recognised with kernel
5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is built
into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45
Country code set by "iw reg set NL" was recognised with kernel 5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so
-sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -###############################################################################
-# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-###############################################################################
-# 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) && sed -e "s/-Werror//g" -i Makefile - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD)
It's not hostapd itself. It's the cgi that use regdump to generate some lists. There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is
built into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45
Country code set by "iw reg set NL" was recognised with kernel 5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78
2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD)
Hi Arne,
On 10/07/2021 09:25, Arne Fitzenreiter wrote:
It's not hostapd itself. It's the cgi that use regdump to generate some lists.
Thanks for the clarification.
There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
I will have a look at this then and see if I can figure something out. If I am unable to then someone else may need to have a go but I will try to start with.
Regards, Adolf.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is built
into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45
Country code set by "iw reg set NL" was recognised with kernel 5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD)
Hi All,
On 10/07/2021 13:17, Adolf Belka wrote:
Hi Arne,
On 10/07/2021 09:25, Arne Fitzenreiter wrote:
It's not hostapd itself. It's the cgi that use regdump to generate some lists.
Thanks for the clarification.
There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
I will have a look at this then and see if I can figure something out. If I am unable to then someone else may need to have a go but I will try to start with.
So my first thought was to build only regdbdump from the crda source tarball. From the makefile it looked like you could run make regdbdump. When I tried that I had an error but also it became clear it needed to have the python2 M2crypto in place to do it, which we obviously don't want to do.
A separate makefile could be made just to build regdbdump using a different crypto program that is in IPFire but all of that is way beyond my capabilities.
A different option is that we could copy the db.txt from the wireless-regdb source tarball to a location and then use that as the database source file for wlanap.cgi. db.txt is the text based equivalent of what is in the regulatory.bin file. A downside of that would be that we would not have the protection of the key signed file but I am not sure if that would be a problem here or not. We could always include a sha256 hash sum and use that to check that there has been no corruption of the file before loading it into @countrylist_cmd in wlanap.cgi
What are the thoughts on my options above or on any additional options that I have not thought of.
Regards,
Adolf.
Regards, Adolf.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is built
into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45
Country code set by "iw reg set NL" was recognised with kernel 5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD)
Hello,
On 11 Jul 2021, at 12:29, Adolf Belka adolf.belka@ipfire.org wrote:
Hi All,
On 10/07/2021 13:17, Adolf Belka wrote:
Hi Arne,
On 10/07/2021 09:25, Arne Fitzenreiter wrote:
It's not hostapd itself. It's the cgi that use regdump to generate some lists.
Thanks for the clarification.
There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
I will have a look at this then and see if I can figure something out. If I am unable to then someone else may need to have a go but I will try to start with.
So my first thought was to build only regdbdump from the crda source tarball. From the makefile it looked like you could run make regdbdump. When I tried that I had an error but also it became clear it needed to have the python2 M2crypto in place to do it, which we obviously don't want to do.
A separate makefile could be made just to build regdbdump using a different crypto program that is in IPFire but all of that is way beyond my capabilities.
A different option is that we could copy the db.txt from the wireless-regdb source tarball to a location and then use that as the database source file for wlanap.cgi. db.txt is the text based equivalent of what is in the regulatory.bin file. A downside of that would be that we would not have the protection of the key signed file but I am not sure if that would be a problem here or not. We could always include a sha256 hash sum and use that to check that there has been no corruption of the file before loading it into @countrylist_cmd in wlanap.cgi
This sounds like the better solution. A text file is fine because we only need a list of countries that are part of the wireless reg database.
What does Arne think?
-Michael
What are the thoughts on my options above or on any additional options that I have not thought of.
Regards,
Adolf.
Regards, Adolf.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka:
- From kernel 4.15 and onwards the function of what crda does is built
into the kernel.
- Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45 Country code set by "iw reg set NL" was recognised with kernel
5.10.45 and set at the global value of 00 with kernel 4.14.232 confirming the kernel built in option is working without the prescence of crda
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/crda | 14 ------- lfs/crda | 78 ------------------------------------ 2 files changed, 92 deletions(-) delete mode 100644 config/rootfiles/common/crda delete mode 100644 lfs/crda
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda deleted file mode 100644 index 5f93bc254..000000000 --- a/config/rootfiles/common/crda +++ /dev/null @@ -1,14 +0,0 @@ -lib/udev/rules.d/85-regulatory.rules -#root/.python-eggs -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda -sbin/regdbdump -#usr/include/reglib -#usr/include/reglib/nl80211.h -#usr/include/reglib/regdb.h -#usr/include/reglib/reglib.h -usr/lib/libreg.so -#usr/share/man/man8/crda.8.gz -#usr/share/man/man8/regdbdump.8.gz diff --git a/lfs/crda b/lfs/crda deleted file mode 100644 index bd812942e..000000000 --- a/lfs/crda +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14
-THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
-############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Hi Arne,
On 11/07/2021 14:51, Michael Tremer wrote:
Hello,
On 11 Jul 2021, at 12:29, Adolf Belka adolf.belka@ipfire.org wrote:
Hi All,
On 10/07/2021 13:17, Adolf Belka wrote:
Hi Arne,
On 10/07/2021 09:25, Arne Fitzenreiter wrote:
It's not hostapd itself. It's the cgi that use regdump to generate some lists.
Thanks for the clarification.
There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
I will have a look at this then and see if I can figure something out. If I am unable to then someone else may need to have a go but I will try to start with.
So my first thought was to build only regdbdump from the crda source tarball. From the makefile it looked like you could run make regdbdump. When I tried that I had an error but also it became clear it needed to have the python2 M2crypto in place to do it, which we obviously don't want to do.
A separate makefile could be made just to build regdbdump using a different crypto program that is in IPFire but all of that is way beyond my capabilities.
A different option is that we could copy the db.txt from the wireless-regdb source tarball to a location and then use that as the database source file for wlanap.cgi. db.txt is the text based equivalent of what is in the regulatory.bin file. A downside of that would be that we would not have the protection of the key signed file but I am not sure if that would be a problem here or not. We could always include a sha256 hash sum and use that to check that there has been no corruption of the file before loading it into @countrylist_cmd in wlanap.cgi
This sounds like the better solution. A text file is fine because we only need a list of countries that are part of the wireless reg database.
What does Arne think?
If you are okay with this approach of creating a text file I will go ahead and redo the previous patch set to include a text file generation and modification of wlanap.cgi to use it.
Regards, Adolf.
-Michael
What are the thoughts on my options above or on any additional options that I have not thought of.
Regards,
Adolf.
Regards, Adolf.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote:
Removing regdump from crda package will break the hostapd webif because this is used to generate the countrylist from wireless-regdb.
I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf.
Arne
Am 2021-06-28 21:13, schrieb Adolf Belka: > - From kernel 4.15 and onwards the function of what crda does is built > into the kernel. > - Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45 > Country code set by "iw reg set NL" was recognised with kernel > 5.10.45 and set at > the global value of 00 with kernel 4.14.232 confirming the kernel > built in option is > working without the prescence of crda > > Tested-by: Adolf Belka adolf.belka@ipfire.org > Signed-off-by: Adolf Belka adolf.belka@ipfire.org > --- > config/rootfiles/common/crda | 14 ------- > lfs/crda | 78 ------------------------------------ > 2 files changed, 92 deletions(-) > delete mode 100644 config/rootfiles/common/crda > delete mode 100644 lfs/crda > > diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda > deleted file mode 100644 > index 5f93bc254..000000000 > --- a/config/rootfiles/common/crda > +++ /dev/null > @@ -1,14 +0,0 @@ > -lib/udev/rules.d/85-regulatory.rules > -#root/.python-eggs > -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp > -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda > -sbin/regdbdump > -#usr/include/reglib > -#usr/include/reglib/nl80211.h > -#usr/include/reglib/regdb.h > -#usr/include/reglib/reglib.h > -usr/lib/libreg.so > -#usr/share/man/man8/crda.8.gz > -#usr/share/man/man8/regdbdump.8.gz > diff --git a/lfs/crda b/lfs/crda > deleted file mode 100644 > index bd812942e..000000000 > --- a/lfs/crda > +++ /dev/null > @@ -1,78 +0,0 @@ > -############################################################################### -# # > -# IPFire.org - A linux based firewall # > -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14 > - > -THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67 > - > -install : $(TARGET) > - > -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > - > -download :$(patsubst %,$(DIR_DL)/%,$(objects)) > - > -md5 : $(subst %,%_MD5,$(objects)) > - > -############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile > - cd $(DIR_APP) && make $(MAKETUNING) > - cd $(DIR_APP) && make install > - @rm -rf $(DIR_APP) > - @$(POSTBUILD)
Hi Everyone,
I have submitted a v2 version of the crda removal patch series.
This now includes placing db.txt from the wireless-regdb source code into /lib/firmware/ and then using this file to provide the country list to variable @countrylist_cmd in wlanap.cgi which was using regdbdump from crda to access the list from regulatory.bin
I don't have any IPFire system with a wireless card built in and I can't mimic that virtually in my VirtualBox vm testbed so someone who has a test system with wireless will need to test this to confirm that the wlanap.cgi change functions as expected.
Regards,
Adolf.
On 16/07/2021 14:28, Adolf Belka wrote:
Hi Arne,
On 11/07/2021 14:51, Michael Tremer wrote:
Hello,
On 11 Jul 2021, at 12:29, Adolf Belka adolf.belka@ipfire.org wrote:
Hi All,
On 10/07/2021 13:17, Adolf Belka wrote:
Hi Arne,
On 10/07/2021 09:25, Arne Fitzenreiter wrote:
It's not hostapd itself. It's the cgi that use regdump to generate some lists.
Thanks for the clarification.
There must be a way to get this list from wireless-regdb. Or we can generate and ship it.
I will have a look at this then and see if I can figure something out. If I am unable to then someone else may need to have a go but I will try to start with.
So my first thought was to build only regdbdump from the crda source tarball. From the makefile it looked like you could run make regdbdump. When I tried that I had an error but also it became clear it needed to have the python2 M2crypto in place to do it, which we obviously don't want to do.
A separate makefile could be made just to build regdbdump using a different crypto program that is in IPFire but all of that is way beyond my capabilities.
A different option is that we could copy the db.txt from the wireless-regdb source tarball to a location and then use that as the database source file for wlanap.cgi. db.txt is the text based equivalent of what is in the regulatory.bin file. A downside of that would be that we would not have the protection of the key signed file but I am not sure if that would be a problem here or not. We could always include a sha256 hash sum and use that to check that there has been no corruption of the file before loading it into @countrylist_cmd in wlanap.cgi
This sounds like the better solution. A text file is fine because we only need a list of countries that are part of the wireless reg database.
What does Arne think?
If you are okay with this approach of creating a text file I will go ahead and redo the previous patch set to include a text file generation and modification of wlanap.cgi to use it.
Regards, Adolf.
-Michael
What are the thoughts on my options above or on any additional options that I have not thought of.
Regards,
Adolf.
Regards, Adolf.
Arne
Am 2021-07-09 12:20, schrieb Adolf Belka:
Hi Arne,
On 09/07/2021 08:26, Arne Fitzenreiter wrote: > Removing regdump from crda package will break the hostapd webif because this is used to > generate the countrylist from wireless-regdb. I thought things had gone too smoothly. Oh well.
I have searched in the hostapd mail list for crda in the subject. Nothing found all the way back to mid 2020 when there was a two year break in any mails listed.
I can't find any way to search the body of the mails for any mention of crda and doing a google search for "hostapd crda" didn't flag anything useful up.
So I think I need to mail the hostapd list to see what their plans are to not use crda (with its python2 dependency) in hostapd.
Does anyone have any other thoughts on how to deal with this?
Regards,
Adolf. > > Arne > > Am 2021-06-28 21:13, schrieb Adolf Belka: >> - From kernel 4.15 and onwards the function of what crda does is built >> into the kernel. >> - Tested the removal of crda with kernel 4.14.232 and kernel 5.10.45 >> Country code set by "iw reg set NL" was recognised with kernel >> 5.10.45 and set at >> the global value of 00 with kernel 4.14.232 confirming the kernel >> built in option is >> working without the prescence of crda >> >> Tested-by: Adolf Belka adolf.belka@ipfire.org >> Signed-off-by: Adolf Belka adolf.belka@ipfire.org >> --- >> config/rootfiles/common/crda | 14 ------- >> lfs/crda | 78 ------------------------------------ >> 2 files changed, 92 deletions(-) >> delete mode 100644 config/rootfiles/common/crda >> delete mode 100644 lfs/crda >> >> diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda >> deleted file mode 100644 >> index 5f93bc254..000000000 >> --- a/config/rootfiles/common/crda >> +++ /dev/null >> @@ -1,14 +0,0 @@ >> -lib/udev/rules.d/85-regulatory.rules >> -#root/.python-eggs >> -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp >> -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto -#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-xxxMACHINExxx.egg-tmp/M2Crypto/__m2crypto.so -sbin/crda >> -sbin/regdbdump >> -#usr/include/reglib >> -#usr/include/reglib/nl80211.h >> -#usr/include/reglib/regdb.h >> -#usr/include/reglib/reglib.h >> -usr/lib/libreg.so >> -#usr/share/man/man8/crda.8.gz >> -#usr/share/man/man8/regdbdump.8.gz >> diff --git a/lfs/crda b/lfs/crda >> deleted file mode 100644 >> index bd812942e..000000000 >> --- a/lfs/crda >> +++ /dev/null >> @@ -1,78 +0,0 @@ >> -############################################################################### -# # >> -# IPFire.org - A linux based firewall # >> -# Copyright (C) 2007-2018 IPFire Team info@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 = 4.14 >> - >> -THISAPP = crda-$(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 = cac7ba8de3e2e6aa46918e0c76df7d67 >> - >> -install : $(TARGET) >> - >> -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> - >> -download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> - >> -md5 : $(subst %,%_MD5,$(objects)) >> - >> -############################################################################### -# 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) && sed -e "s/-Werror//g" -i Makefile >> - cd $(DIR_APP) && make $(MAKETUNING) >> - cd $(DIR_APP) && make install >> - @rm -rf $(DIR_APP) >> - @$(POSTBUILD)
-
Adolf Belka -
Arne Fitzenreiter -
Michael Tremer