Development May 2021

development@lists.ipfire.org

18 participants
107 discussions

[PATCH] python3-setuptools: Create a python3 version of python-setuptools
by Adolf Belka 16 May '21

16 May '21

- python3-setuptools works with python3-daemon but not with python-m2crypto. m2crypto has to stay with python2 because crda will not find the python3 version of m2crypto. - python-m2crypto only works with python-setuptools so both the python2 and python3 versions of setuptools need to stay in place. - Therefore this patch only creates python3-setuptools, it does not remove python-setuptools Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/python3-setuptools | 175 +++++++++++++++++++ lfs/python3-setuptools | 82 +++++++++ make.sh | 1 + 3 files changed, 258 insertions(+) create mode 100644 config/rootfiles/packages/python3-setuptools create mode 100644 lfs/python3-setuptools diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools new file mode 100644 index 000000000..cb6e9b037 --- /dev/null +++ b/config/rootfiles/packages/python3-setuptools @@ -0,0 +1,175 @@ +#usr/lib/python3.8/site-packages/easy-install.pth +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/PKG-INFO +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/SOURCES.txt +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/dependency_links.txt +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/entry_points.txt +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/not-zip-safe +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/requires.txt +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/EGG-INFO/top_level.txt +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/_distutils_hack +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/_distutils_hack/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/_distutils_hack/override.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/__init__.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/appdirs.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/__about__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/_compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/_structures.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/_typing.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/markers.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/requirements.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/specifiers.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/tags.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/utils.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/packaging/version.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/_vendor/pyparsing.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/extern +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/extern/__init__.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/tests +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/tests/data +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/tests/data/my-test-package-source +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/pkg_resources/tests/data/my-test-package-source/setup.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_deprecation_warning.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/_msvccompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/archive_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/bcppcompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/ccompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/cmd.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/bdist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/bdist_dumb.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/bdist_msi.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/bdist_rpm.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/bdist_wininst.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/build.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/build_clib.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/build_ext.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/build_py.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/build_scripts.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/check.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/clean.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/config.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install_data.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install_egg_info.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install_headers.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install_lib.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/install_scripts.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/py37compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/register.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/sdist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/command/upload.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/config.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/core.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/cygwinccompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/debug.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/dep_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/dir_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/dist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/errors.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/extension.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/fancy_getopt.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/file_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/filelist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/log.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/msvc9compiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/msvccompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/py35compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/py38compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/spawn.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/sysconfig.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/text_file.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/unixccompiler.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/version.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_distutils/versionpredicate.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_imp.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/ordered_set.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/__about__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/_compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/_structures.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/_typing.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/markers.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/requirements.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/specifiers.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/tags.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/utils.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/packaging/version.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/_vendor/pyparsing.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/archive_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/build_meta.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/cli-32.exe +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/cli-64.exe +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/cli.exe +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/alias.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/bdist_egg.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/bdist_rpm.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/build_clib.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/build_ext.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/build_py.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/develop.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/dist_info.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/easy_install.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/egg_info.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/install.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/install_egg_info.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/install_lib.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/install_scripts.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/launcher +#manifest.xml +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/py36compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/register.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/rotate.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/saveopts.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/sdist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/setopt.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/test.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/upload.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/command/upload_docs.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/config.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/dep_util.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/depends.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/dist.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/errors.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/extension.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/extern +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/extern/__init__.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/glob.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/gui-32.exe +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/gui-64.exe +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/gui.exe +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/installer.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/launch.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/lib2to3_ex.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/monkey.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/msvc.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/namespaces.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/package_index.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/py34compat.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/sandbox.py +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/script +#(dev).tmpl +#usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/script.tmpl +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/ssl_support.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/unicode_utils.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/version.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/wheel.py +usr/lib/python3.8/site-packages/setuptools-56.2.0-py3.8.egg/setuptools/windows_support.py +#usr/lib/python3.8/site-packages/setuptools.pth diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools new file mode 100644 index 000000000..3c765d2a8 --- /dev/null +++ b/lfs/python3-setuptools @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 56.2.0 + +THISAPP = setuptools-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-setuptools +PAK_VER = 3 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e8caf0f129f585a887bb3cbb528149d1 + +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) && python3 setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 27d1f2e87..301e6eedc 100755 --- a/make.sh +++ b/make.sh @@ -1345,6 +1345,7 @@ buildipfire() { lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet lfsmake2 python-setuptools + lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon -- 2.31.1

1 0

[PATCH] ddns: Add provider Feste-IP.Net From: Martin Krieger <makrie@posteo.de>
by Martin Krieger 16 May '21

16 May '21

Add support for provider Feste-IP.Net to ipfire ddns system. Signed-off-by: Martin Krieger <makrie(a)posteo.de> --- IPv6 support included based on API description but not tested. Test system is connected by VDSL and internet provider connection is pure IPv4 (No dualstack). --- README | 1 + src/ddns/providers.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/README b/README index b6decb35c338..fa6ce5e598b8 100644 --- a/README +++ b/README @@ -68,6 +68,7 @@ SUPPORTED PROVIDERS: easydns.com enom.com entrydns.net + feste-ip.net freedns.afraid.org inwx.com|de|at|ch|es itsdns.de diff --git a/src/ddns/providers.py b/src/ddns/providers.py index 56e6620c78ab..c8be31622c3a 100644 --- a/src/ddns/providers.py +++ b/src/ddns/providers.py @@ -1178,6 +1178,28 @@ class DDNSProviderEntryDNS(DDNSProvider): # If we got here, some other update error happened. raise DDNSUpdateError +class DDNSProviderFesteIPNet(DDNSProtocolDynDNS2, DDNSProvider): + handle = "feste-ip.net" + name = "Feste-IP.Net" + website = "https://www.feste-ip.net/" + + # Information about the format of the request is to be found + # https://forum.feste-ip.net/viewtopic.php?f=13&t=469 + + url = "https://members.feste-ip.net/nic/update/" + + def update(self): + data = DDNSProtocolDynDNS2.prepare_request_data(self, "ipv4") + + # This one supports IPv6 + myipv6 = self.get_address("ipv6") + + # Add update information if we have an IPv6 address. + if myipv6: + data["myip2"] = myipv6 + + self.send_request(data) + class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): handle = "freedns.afraid.org" -- 2.31.0

1 0

[PATCH 1/2] python3-docutils: build prior python3-daemon
by Arne Fitzenreiter 16 May '21

16 May '21

python3-daemon has a builddepency to python3-docutils Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/rootfiles/packages/python3-docutils | 10 ++++++++++ make.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/python3-docutils b/config/rootfiles/packages/python3-docutils index 3429e97d6..fa0c6f3a7 100644 --- a/config/rootfiles/packages/python3-docutils +++ b/config/rootfiles/packages/python3-docutils @@ -1,5 +1,15 @@ +usr/bin/rst2html.py usr/bin/rst2html4.py usr/bin/rst2html5.py +usr/bin/rst2latex.py +usr/bin/rst2man.py +usr/bin/rst2odt.py +usr/bin/rst2odt_prepstyles.py +usr/bin/rst2pseudoxml.py +usr/bin/rst2s5.py +usr/bin/rst2xetex.py +usr/bin/rst2xml.py +usr/bin/rstpep2html.py #usr/lib/python3.8/site-packages/docutils #usr/lib/python3.8/site-packages/docutils-0.16-py3.8.egg-info #usr/lib/python3.8/site-packages/docutils-0.16-py3.8.egg-info/PKG-INFO diff --git a/make.sh b/make.sh index 60474a18e..d1a5fe68d 100755 --- a/make.sh +++ b/make.sh @@ -1347,6 +1347,7 @@ buildipfire() { lfsmake2 python-setuptools lfsmake2 python3-inotify lfsmake2 python-docutils + lfsmake2 python3-docutils lfsmake2 python3-daemon lfsmake2 glib lfsmake2 ntp @@ -1544,7 +1545,6 @@ buildipfire() { lfsmake2 python3-dateutil lfsmake2 python3-jmespath lfsmake2 python3-colorama - lfsmake2 python3-docutils lfsmake2 python3-yaml lfsmake2 python3-s3transfer lfsmake2 python3-rsa -- 2.25.1

1 1

[PATCH] python-pyparsing: Update to 2.4.7 and migrate to python3
by Adolf Belka 16 May '21

16 May '21

- Update from 2.2.0 to 2.4.7 - Migrate from python2 to python3 - Move the rootfile from common to packages as pyparsing is an addon Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/python-pyparsing | 1 - config/rootfiles/packages/python3-pyparsing | 9 +++++++++ lfs/{python-pyparsing => python3-pyparsing} | 10 +++++----- make.sh | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 config/rootfiles/common/python-pyparsing create mode 100644 config/rootfiles/packages/python3-pyparsing rename lfs/{python-pyparsing => python3-pyparsing} (94%) diff --git a/config/rootfiles/common/python-pyparsing b/config/rootfiles/common/python-pyparsing deleted file mode 100644 index 9babda975..000000000 --- a/config/rootfiles/common/python-pyparsing +++ /dev/null @@ -1 +0,0 @@ -#usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg diff --git a/config/rootfiles/packages/python3-pyparsing b/config/rootfiles/packages/python3-pyparsing new file mode 100644 index 000000000..3106ff1b6 --- /dev/null +++ b/config/rootfiles/packages/python3-pyparsing @@ -0,0 +1,9 @@ +#usr/lib/python3.8/site-packages/easy-install.pth +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/PKG-INFO +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/SOURCES.txt +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/dependency_links.txt +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/not-zip-safe +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/top_level.txt +usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/pyparsing.py diff --git a/lfs/python-pyparsing b/lfs/python3-pyparsing similarity index 94% rename from lfs/python-pyparsing rename to lfs/python3-pyparsing index f42e1ac94..45e960a2b 100644 --- a/lfs/python-pyparsing +++ b/lfs/python3-pyparsing @@ -24,15 +24,15 @@ include Config -VER = 2.2.0 +VER = 2.4.7 THISAPP = pyparsing-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-pyparsing -PAK_VER = 2 +PROG = python3-pyparsing +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0214e42d63af850256962b6744c948d9 +$(DL_FILE)_MD5 = f0953e47a0112f7a65aec2305ffdf7b4 install : $(TARGET) @@ -77,6 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install + cd $(DIR_APP) && python3 setup.py install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4af0081e9..27d1f2e87 100755 --- a/make.sh +++ b/make.sh @@ -1453,7 +1453,7 @@ buildipfire() { lfsmake2 igmpproxy lfsmake2 fbset lfsmake2 opus - lfsmake2 python-pyparsing + lfsmake2 python3-pyparsing lfsmake2 spice-protocol lfsmake2 spice lfsmake2 sdl -- 2.31.1

1 0

[PATCH 1/4] make.sh: Removal of three python2 modules
by Adolf Belka 15 May '21

15 May '21

- Removal of python-distutils and python-distutils-extra as these have been replaced by setuptools. - Removal of python-optional-src - Only python-distutils-extra line is removed from make.sh as python-distutils and python-optional-src were not in make.sh These two modules have not been getting built historically Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- make.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/make.sh b/make.sh index 2586c4e63..4af0081e9 100755 --- a/make.sh +++ b/make.sh @@ -1538,7 +1538,6 @@ buildipfire() { lfsmake2 wireless-regdb lfsmake2 crda lfsmake2 libsolv - lfsmake2 python-distutils-extra lfsmake2 ddns lfsmake2 python3-setuptools-scm lfsmake2 python3-dateutil -- 2.31.1

1 3

[PATCH v2] nmap: Migrate to python3
by Adolf Belka 15 May '21

15 May '21

- Added PYTHON=python3 prior to configure. This then builds nmap with python3. - ndiff is written as python2 only and currently no patches to make it work wih python3 have been accepted by the nmap team. It looks like ndiff will stay as it is for some time so ndiff will be removed from the nmap package install. - Added --without-ndiff to configure so nmap is built without ndiff - Updated rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/nmap | 5 ----- lfs/nmap | 14 ++++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index 028408ca0..7c6b0ee83 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -1,9 +1,5 @@ -usr/bin/ndiff usr/bin/nmap usr/bin/nping -#usr/bin/uninstall_ndiff -usr/lib/python2.7/site-packages/ndiff.py -#usr/lib/python2.7/site-packages/ndiff.pyc #usr/share/man/de/man1/nmap.1 #usr/share/man/es/man1/nmap.1 #usr/share/man/fr/man1/nmap.1 @@ -15,7 +11,6 @@ usr/lib/python2.7/site-packages/ndiff.py #usr/share/man/hu/man1/nmap.1 #usr/share/man/it/man1/nmap.1 #usr/share/man/ja/man1/nmap.1 -#usr/share/man/man1/ndiff.1 #usr/share/man/man1/nmap.1 #usr/share/man/man1/nping.1 #usr/share/man/pl diff --git a/lfs/nmap b/lfs/nmap index d0d4d3428..bd2ea9b03 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -78,11 +78,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --without-nmapfe \ - --without-zenmap \ - --without-ncat + cd $(DIR_APP) && PYTHON=python3 \ + ./configure \ + --prefix=/usr \ + --without-nmapfe \ + --without-zenmap \ + --without-ncat \ + --without-ndiff cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.31.1

1 0

[PATCH] sudo: Update to 1.9.7
by Adolf Belka 15 May '21

15 May '21

- Update from 1.9.6p1 to 1.9.7 - Update of rootfile not required - Changelog The fuzz Makefile target now runs all the fuzzers for 8192 passes (can be overridden via the FUZZ_RUNS variable). This makes it easier to run the fuzzers in-tree. To run a fuzzer indefinitely, set FUZZ_RUNS=-1, e.g. make FUZZ_RUNS=-1 fuzz. Fixed fuzzing on FreeBSD where the ld.lld linker returns an error by default when a symbol is multiply-defined. Added support for determining local IPv6 addresses on systems that lack the getifaddrs() function. This now works on AIX, HP-UX and Solaris (at least). Bug #969. Fixed a bug introduced in sudo 1.9.6 that caused sudo -V to report a usage error. Also, when invoked as sudoedit, sudo now allows a more restricted set of options that matches the usage statement and documentation. GitHub Issue #95. Fixed a crash in sudo_sendlog when the specified certificate or key does not exist or is invalid. Bug #970. Fixed a compilation error when sudo is configured with the disable-log-clientoption. Sudo's limited support for SUCCESS=return entries in nsswitch.conf is now documented. Bug #971. Sudo now requires autoconf 2.70 or higher to regenerate the configure script. Bug #972. sudo_logsrvd now has a relay mode which can be used to create a hierarchy of log servers. By default, when a relay server is defined, messages from the client are forwarded immediately to the relay. However, if the store_first setting is enabled, the log will be stored locally until the command completes and then relayed. Bug #965. Sudo now links with OpenSSL by default if it is available unless the --disable-openssl configure option is used or both the --disable-log-client and --disable-log-server configure options are specified. Fixed configure's Python version detection when the version minor number is more than a single digit, for example Python 3.10. The sudo Python module tests now pass for Python 3.10. Sudo will now avoid changing the datasize resource limit as long as the existing value is at least 1GB. This works around a problem on 64-bit HP-UX where it is not possible to exactly restore the original datasize limit. Bug #973. Fixed a race condition that could result in a hang when sudo is executed by a process where the SIGCHLD handler is set to SIG_IGN. This fixes the bug described by GitHub PR #98. Fixed an out-of-bounds read in sudoedit and visudo when the EDITOR, VISUAL or SUDO_EDITOR environment variables end in an unescaped backslash. Also fixed the handling of quote characters that are escaped by a backslash. GitHub Issue #99. Fixed a bug that prevented the log_server_verify sudoers option from taking effect. The sudo_sendlog utility has a new -s option to cause it to stop sending I/O records after a user-specified elapsed time. This can be used to test the I/O log restart functionality of sudo_logsrvd. Fixed a crash introduced in sudo 1.9.4 in sudo_logsrvd when attempting to restart an interrupted I/O log transfer. The TLS connection timeout in the sudoers log client was previously hard-coded to 10 seconds. It now uses the value of log_server_timeout. The configure script now outputs a summary of the user-configurable options at the end, separate from output of configure script tests. Bug #820. Corrected the description of which groups may be specified via the -g option in the Runas_Spec section. Bug #975. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sudo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sudo b/lfs/sudo index 6c09fac10..ab6fbf99b 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@ include Config -VER = 1.9.6p1 +VER = 1.9.7 THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 334f8337d497f2f5df2db72448bd259d +$(DL_FILE)_MD5 = 1ed8b73ba56c9b05ed22681b7b92d1b2 install : $(TARGET) -- 2.31.1

1 0

python3-daemon fails to build
by Peter Müller 15 May '21

15 May '21

Hello development folks, just thought you might want to know: > python-docutils (0.12) [ DONE ] > python3-daemon (2.1.1) [ 8 ][ FAIL ] > > Traceback (most recent call last): > File "/usr/lib/python3.8/site-packages/setuptools/installer.py", line 128, in fetch_build_egg > subprocess.check_call(cmd) > File "/usr/lib/python3.8/subprocess.py", line 364, in check_call > raise CalledProcessError(retcode, cmd) > subprocess.CalledProcessError: Command '['/usr/bin/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpldy8j00v', '--quiet', 'docutils']' returned non-zero exit status 1. > > The above exception was the direct cause of the following exception: > > Traceback (most recent call last): > File "setup.py", line 51, in <module> > setup( > File "/usr/lib/python3.8/site-packages/setuptools/__init__.py", line 164, in setup > _install_setup_requires(attrs) > File "/usr/lib/python3.8/site-packages/setuptools/__init__.py", line 159, in _install_setup_requires > dist.fetch_build_eggs(dist.setup_requires) > File "/usr/lib/python3.8/site-packages/setuptools/dist.py", line 699, in fetch_build_eggs > resolved_dists = pkg_resources.working_set.resolve( > File "/usr/lib/python3.8/site-packages/pkg_resources/__init__.py", line 779, in resolve > dist = best[req.key] = env.best_match( > File "/usr/lib/python3.8/site-packages/pkg_resources/__init__.py", line 1064, in best_match > return self.obtain(req, installer) > File "/usr/lib/python3.8/site-packages/pkg_resources/__init__.py", line 1076, in obtain > return installer(requirement) > File "/usr/lib/python3.8/site-packages/setuptools/dist.py", line 758, in fetch_build_egg > return fetch_build_egg(self, req) > File "/usr/lib/python3.8/site-packages/setuptools/installer.py", line 130, in fetch_build_egg > raise DistutilsError(str(e)) from e > distutils.errors.DistutilsError: Command '['/usr/bin/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpldy8j00v', '--quiet', 'docutils']' returned non-zero exit status 1. > make: *** [python3-daemon:73: /usr/src/log/python-daemon-2.1.1] Error 1 > > ERROR: Building python3-daemon [ FAIL ] > Check /home/pmu/ipfire-2.x/log/_build.ipfire.log for errors if applicable [ FAIL ] Looks like python3-daemon depends on python3-docutils, but I am not quite sure... Thanks, and best regards, Peter Müller

2 2

[PATCH] Tor: update to 0.4.5.8
by Peter Müller 15 May '21

15 May '21

Full changelog as per https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.5.8: Changes in version 0.4.5.8 - 2021-05-10 Tor 0.4.5.8 fixes several bugs in earlier version, backporting fixes from the 0.4.6.x series. o Minor features (compatibility, Linux seccomp sandbox, backport from 0.4.6.3-rc): - Add a workaround to enable the Linux sandbox to work correctly with Glibc 2.33. This version of Glibc has started using the fstatat() system call, which previously our sandbox did not allow. Closes ticket 40382; see the ticket for a discussion of trade-offs. o Minor features (compilation, backport from 0.4.6.3-rc): - Make the autoconf script build correctly with autoconf versions 2.70 and later. Closes part of ticket 40335. o Minor features (fallback directory list, backport from 0.4.6.2-alpha): - Regenerate the list of fallback directories to contain a new set of 200 relays. Closes ticket 40265. o Minor features (geoip data): - Update the geoip files to match the IPFire Location Database, as retrieved on 2021/05/07. o Minor features (onion services): - Add warning message when connecting to now deprecated v2 onion services. As announced, Tor 0.4.5.x is the last series that will support v2 onions. Closes ticket 40373. o Minor bugfixes (bridge, pluggable transport, backport from 0.4.6.2-alpha): - Fix a regression that made it impossible start Tor using a bridge line with a transport name and no fingerprint. Fixes bug 40360; bugfix on 0.4.5.4-rc. o Minor bugfixes (build, cross-compilation, backport from 0.4.6.3-rc): - Allow a custom "ar" for cross-compilation. Our previous build script had used the $AR environment variable in most places, but it missed one. Fixes bug 40369; bugfix on 0.4.5.1-alpha. o Minor bugfixes (channel, DoS, backport from 0.4.6.2-alpha): - Fix a non-fatal BUG() message due to a too-early free of a string, when listing a client connection from the DoS defenses subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc. o Minor bugfixes (compiler warnings, backport from 0.4.6.3-rc): - Fix an indentation problem that led to a warning from GCC 11.1.1. Fixes bug 40380; bugfix on 0.3.0.1-alpha. o Minor bugfixes (controller, backport from 0.4.6.1-alpha): - Fix a "BUG" warning that would appear when a controller chooses the first hop for a circuit, and that circuit completes. Fixes bug 40285; bugfix on 0.3.2.1-alpha. o Minor bugfixes (onion service, client, memory leak, backport from 0.4.6.3-rc): - Fix a bug where an expired cached descriptor could get overwritten with a new one without freeing it, leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. o Minor bugfixes (testing, BSD, backport from 0.4.6.2-alpha): - Fix pattern-matching errors when patterns expand to invalid paths on BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index 34e3b3ffb..9d40be1ce 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.4.5.7 +VER = 0.4.5.8 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 59 +PAK_VER = 60 DEPS = libseccomp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3a1800592293a8d4122823eab9233739 +$(DL_FILE)_MD5 = a39d9b930a19936b57f097051c0ad509 install : $(TARGET) -- 2.26.2

2 1

[PATCH] kernel: update to 4.14.232
by Arne Fitzenreiter 14 May '21

14 May '21

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 3 +-- config/rootfiles/common/aarch64/linux-headers | 1 + config/rootfiles/common/armv5tel/linux-headers | 1 + config/rootfiles/common/armv5tel/linux-multi | 3 +-- config/rootfiles/common/i586/linux | 3 +-- config/rootfiles/common/i586/linux-headers | 1 + config/rootfiles/common/x86_64/linux | 3 +-- config/rootfiles/common/x86_64/linux-headers | 1 + lfs/linux | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 9e8563cbd..5fc959ce2 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.229 Kernel Configuration +# Linux/arm64 4.14.232 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index c40eb9f55..df767a134 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.229-ipfire-multi Kernel Configuration +# Linux/arm 4.14.232-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 448b8a84b..3dc0d83f8 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.229 Kernel Configuration +# Linux/x86 4.14.232 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index c15fa8efc..3bc45c86b 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.230 Kernel Configuration +# Linux/x86 4.14.232 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index cbd3fcf4f..8d0c3cfbc 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -10675,9 +10675,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/usb/sevseg.h #lib/modules/KVER-ipfire/build/include/config/usb/sierra #lib/modules/KVER-ipfire/build/include/config/usb/sierra/net.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga #lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga/con.h #lib/modules/KVER-ipfire/build/include/config/usb/sl811 #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd.h @@ -15192,6 +15190,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_fs.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_mount.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_no.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/ncsi.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ndctl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/neighbour.h #lib/modules/KVER-ipfire/build/include/uapi/linux/net.h diff --git a/config/rootfiles/common/aarch64/linux-headers b/config/rootfiles/common/aarch64/linux-headers index 68e79e09e..1383385db 100644 --- a/config/rootfiles/common/aarch64/linux-headers +++ b/config/rootfiles/common/aarch64/linux-headers @@ -404,6 +404,7 @@ #usr/include/linux/ncp_fs.h #usr/include/linux/ncp_mount.h #usr/include/linux/ncp_no.h +#usr/include/linux/ncsi.h #usr/include/linux/ndctl.h #usr/include/linux/neighbour.h #usr/include/linux/net.h diff --git a/config/rootfiles/common/armv5tel/linux-headers b/config/rootfiles/common/armv5tel/linux-headers index 931d37c22..69669af20 100644 --- a/config/rootfiles/common/armv5tel/linux-headers +++ b/config/rootfiles/common/armv5tel/linux-headers @@ -406,6 +406,7 @@ #usr/include/linux/ncp_fs.h #usr/include/linux/ncp_mount.h #usr/include/linux/ncp_no.h +#usr/include/linux/ncsi.h #usr/include/linux/ndctl.h #usr/include/linux/neighbour.h #usr/include/linux/net.h diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index b5df3ef34..43341f014 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -11627,9 +11627,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/usb/sevseg.h #lib/modules/KVER-ipfire-multi/build/include/config/usb/sierra #lib/modules/KVER-ipfire-multi/build/include/config/usb/sierra/net.h -#lib/modules/KVER-ipfire-multi/build/include/config/usb/sisusbvga #lib/modules/KVER-ipfire-multi/build/include/config/usb/sisusbvga.h -#lib/modules/KVER-ipfire-multi/build/include/config/usb/sisusbvga/con.h #lib/modules/KVER-ipfire-multi/build/include/config/usb/sl811 #lib/modules/KVER-ipfire-multi/build/include/config/usb/sl811/hcd #lib/modules/KVER-ipfire-multi/build/include/config/usb/sl811/hcd.h @@ -16151,6 +16149,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/ncp_fs.h #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/ncp_mount.h #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/ncp_no.h +#lib/modules/KVER-ipfire-multi/build/include/uapi/linux/ncsi.h #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/ndctl.h #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/neighbour.h #lib/modules/KVER-ipfire-multi/build/include/uapi/linux/net.h diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 4c2113823..f48f4c9a7 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -11639,9 +11639,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/usb/sevseg.h #lib/modules/KVER-ipfire/build/include/config/usb/sierra #lib/modules/KVER-ipfire/build/include/config/usb/sierra/net.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga #lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga/con.h #lib/modules/KVER-ipfire/build/include/config/usb/sl811 #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd.h @@ -16371,6 +16369,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_fs.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_mount.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_no.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/ncsi.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ndctl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/neighbour.h #lib/modules/KVER-ipfire/build/include/uapi/linux/net.h diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/common/i586/linux-headers index 594f9fbd5..572abb80e 100644 --- a/config/rootfiles/common/i586/linux-headers +++ b/config/rootfiles/common/i586/linux-headers @@ -432,6 +432,7 @@ #usr/include/linux/ncp_fs.h #usr/include/linux/ncp_mount.h #usr/include/linux/ncp_no.h +#usr/include/linux/ncsi.h #usr/include/linux/ndctl.h #usr/include/linux/neighbour.h #usr/include/linux/net.h diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 06de3c089..7de1935ef 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -11610,9 +11610,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/usb/sevseg.h #lib/modules/KVER-ipfire/build/include/config/usb/sierra #lib/modules/KVER-ipfire/build/include/config/usb/sierra/net.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga #lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga.h -#lib/modules/KVER-ipfire/build/include/config/usb/sisusbvga/con.h #lib/modules/KVER-ipfire/build/include/config/usb/sl811 #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd #lib/modules/KVER-ipfire/build/include/config/usb/sl811/hcd.h @@ -16388,6 +16386,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_fs.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_mount.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ncp_no.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/ncsi.h #lib/modules/KVER-ipfire/build/include/uapi/linux/ndctl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/neighbour.h #lib/modules/KVER-ipfire/build/include/uapi/linux/net.h diff --git a/config/rootfiles/common/x86_64/linux-headers b/config/rootfiles/common/x86_64/linux-headers index 594f9fbd5..572abb80e 100644 --- a/config/rootfiles/common/x86_64/linux-headers +++ b/config/rootfiles/common/x86_64/linux-headers @@ -432,6 +432,7 @@ #usr/include/linux/ncp_fs.h #usr/include/linux/ncp_mount.h #usr/include/linux/ncp_no.h +#usr/include/linux/ncsi.h #usr/include/linux/ndctl.h #usr/include/linux/neighbour.h #usr/include/linux/net.h diff --git a/lfs/linux b/lfs/linux index e6030bd49..be3af97bb 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.230 -ARM_PATCHES = 4.14.230-ipfire0 +VER = 4.14.232 +ARM_PATCHES = 4.14.232-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -79,7 +79,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 9fceffba37032235767745a83b2f7ad2 +$(DL_FILE)_MD5 = f9dbc2f2656f30aef8394ac9d4ee88b3 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = a04b842733999abb818cabb0388572b8 install : $(TARGET) -- 2.25.1

2 1

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2021