From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4dyPFN5Bnsz2y1f for ; Fri, 23 Jan 2026 16:55:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4dyPFN4shCz2xLt for ; Fri, 23 Jan 2026 16:55:36 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E7" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4dyPFM1hHYz1qS for ; Fri, 23 Jan 2026 16:55:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1769187335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Qfk4obFd9XQmGQCf02t3k2eRyADyMMve5gEoKrTvbbk=; b=/OMHxcaoVPTP5wYUSzVFSkQzSHkIw2Vhz6oTWWcDRu7ZOlkqES74DTa6D+iAoG5QJa5zbm c9Bj1MVcpOibLrAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1769187335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Qfk4obFd9XQmGQCf02t3k2eRyADyMMve5gEoKrTvbbk=; b=uA4zbXJAUmTUCBZdSPotRnLNl4jRNjewX3367XcCD6bYi9yMe2pV0RAlLYZPtJbLZDQKLG x5LWhlLuoDN77P7xoj2elH2LFdXBVYoP915SaIXcC+ihNvC8fxPp9dgZFX7J9K2MYag1LM hdUsLRIhykmR5/KIhu5PWwdarjGjUPlq8AHT2r4rVVcFuIJ4p8N6DVHCqactudLHz+Lvak 1PnRZVeL23QMhK9hMkmnXltx55joJpRqN1kNwLgamtQTuN5p5w3SlZ+EAKns/aYGnEAGIC qq5eq57qKcKHHYTLF4NqVre5G/XSrfR7dLdCnhFJVfaGOA6F1T/K8+a3I87STg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4dyPFL0nXGz2xNf; Fri, 23 Jan 2026 16:55:34 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, core199, updated. 053a3ca4329bfe093d00401362261534fda64eb9 X-Git-Refname: refs/heads/core199 X-Git-Reftype: branch X-Git-Oldrev: a259d423c79303285695946975e3f41a619f212c X-Git-Newrev: 053a3ca4329bfe093d00401362261534fda64eb9 Message-Id: <4dyPFL0nXGz2xNf@people01.haj.ipfire.org> Date: Fri, 23 Jan 2026 16:55:33 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core199 has been updated via 053a3ca4329bfe093d00401362261534fda64eb9 (commit) from a259d423c79303285695946975e3f41a619f212c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 053a3ca4329bfe093d00401362261534fda64eb9 Author: Michael Tremer Date: Fri Jan 23 14:51:48 2026 +0000 oci-cli: Add missing dependencies Since the last update, the OCI CLI package requires some extra Python dependenices. I find it very annoying that Python won't check this during build time, so I added an extra step where we will run "oci --help" and see if the command is coming up at all. Hopefully that will be sufficient any no further Python modules will be loaded whenever they are needed. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/python3-prompt-toolkit | 176 +++++++++++++++++++++++ config/rootfiles/packages/python3-wcwidth | 20 +++ lfs/oci-cli | 11 +- lfs/{python3-pillow => python3-prompt-toolkit} | 11 +- lfs/{python3-pillow => python3-wcwidth} | 16 ++- make.sh | 2 + 6 files changed, 225 insertions(+), 11 deletions(-) create mode 100644 config/rootfiles/packages/python3-prompt-toolkit create mode 100644 config/rootfiles/packages/python3-wcwidth copy lfs/{python3-pillow => python3-prompt-toolkit} (91%) copy lfs/{python3-pillow => python3-wcwidth} (85%) Difference in files: diff --git a/config/rootfiles/packages/python3-prompt-toolkit b/config/rootfiles/packages/python3-prompt-toolkit new file mode 100644 index 000000000..7ba32e2bd --- /dev/null +++ b/config/rootfiles/packages/python3-prompt-toolkit @@ -0,0 +1,176 @@ +#usr/lib/python3.10/site-packages/prompt_toolkit +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/METADATA +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/RECORD +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/WHEEL +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/licenses +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/licenses/AUTHORS.rst +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/licenses/LICENSE +#usr/lib/python3.10/site-packages/prompt_toolkit-3.0.52.dist-info/top_level.txt +usr/lib/python3.10/site-packages/prompt_toolkit/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/application +usr/lib/python3.10/site-packages/prompt_toolkit/application/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/application/application.py +usr/lib/python3.10/site-packages/prompt_toolkit/application/current.py +usr/lib/python3.10/site-packages/prompt_toolkit/application/dummy.py +usr/lib/python3.10/site-packages/prompt_toolkit/application/run_in_terminal.py +usr/lib/python3.10/site-packages/prompt_toolkit/auto_suggest.py +usr/lib/python3.10/site-packages/prompt_toolkit/buffer.py +usr/lib/python3.10/site-packages/prompt_toolkit/cache.py +usr/lib/python3.10/site-packages/prompt_toolkit/clipboard +usr/lib/python3.10/site-packages/prompt_toolkit/clipboard/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/clipboard/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/clipboard/in_memory.py +usr/lib/python3.10/site-packages/prompt_toolkit/clipboard/pyperclip.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion +usr/lib/python3.10/site-packages/prompt_toolkit/completion/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/deduplicate.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/filesystem.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/fuzzy_completer.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/nested.py +usr/lib/python3.10/site-packages/prompt_toolkit/completion/word_completer.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/completers +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/completers/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/completers/system.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/compiler.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/completion.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/lexer.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/regex_parser.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/regular_languages/validation.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/ssh +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/ssh/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/ssh/server.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/telnet +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/telnet/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/telnet/log.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/telnet/protocol.py +usr/lib/python3.10/site-packages/prompt_toolkit/contrib/telnet/server.py +usr/lib/python3.10/site-packages/prompt_toolkit/cursor_shapes.py +usr/lib/python3.10/site-packages/prompt_toolkit/data_structures.py +usr/lib/python3.10/site-packages/prompt_toolkit/document.py +usr/lib/python3.10/site-packages/prompt_toolkit/enums.py +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop/async_generator.py +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop/inputhook.py +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/eventloop/win32.py +usr/lib/python3.10/site-packages/prompt_toolkit/filters +usr/lib/python3.10/site-packages/prompt_toolkit/filters/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/filters/app.py +usr/lib/python3.10/site-packages/prompt_toolkit/filters/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/filters/cli.py +usr/lib/python3.10/site-packages/prompt_toolkit/filters/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/ansi.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/html.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/pygments.py +usr/lib/python3.10/site-packages/prompt_toolkit/formatted_text/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/history.py +usr/lib/python3.10/site-packages/prompt_toolkit/input +usr/lib/python3.10/site-packages/prompt_toolkit/input/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/ansi_escape_sequences.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/defaults.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/posix_pipe.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/posix_utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/typeahead.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/vt100.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/vt100_parser.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/win32.py +usr/lib/python3.10/site-packages/prompt_toolkit/input/win32_pipe.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/auto_suggest.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/basic.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/completion.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/cpr.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/emacs.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/focus.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/mouse.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/named_commands.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/open_in_editor.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/page_navigation.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/scroll.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/search.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/bindings/vi.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/defaults.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/digraphs.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/emacs_state.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/key_bindings.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/key_processor.py +usr/lib/python3.10/site-packages/prompt_toolkit/key_binding/vi_state.py +usr/lib/python3.10/site-packages/prompt_toolkit/keys.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout +usr/lib/python3.10/site-packages/prompt_toolkit/layout/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/containers.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/controls.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/dimension.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/dummy.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/layout.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/margins.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/menus.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/mouse_handlers.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/processors.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/screen.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/scrollable_pane.py +usr/lib/python3.10/site-packages/prompt_toolkit/layout/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/lexers +usr/lib/python3.10/site-packages/prompt_toolkit/lexers/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/lexers/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/lexers/pygments.py +usr/lib/python3.10/site-packages/prompt_toolkit/log.py +usr/lib/python3.10/site-packages/prompt_toolkit/mouse_events.py +usr/lib/python3.10/site-packages/prompt_toolkit/output +usr/lib/python3.10/site-packages/prompt_toolkit/output/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/color_depth.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/conemu.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/defaults.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/flush_stdout.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/plain_text.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/vt100.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/win32.py +usr/lib/python3.10/site-packages/prompt_toolkit/output/windows10.py +usr/lib/python3.10/site-packages/prompt_toolkit/patch_stdout.py +usr/lib/python3.10/site-packages/prompt_toolkit/py.typed +usr/lib/python3.10/site-packages/prompt_toolkit/renderer.py +usr/lib/python3.10/site-packages/prompt_toolkit/search.py +usr/lib/python3.10/site-packages/prompt_toolkit/selection.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/choice_input.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/dialogs.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/progress_bar +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/progress_bar/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/progress_bar/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/progress_bar/formatters.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/prompt.py +usr/lib/python3.10/site-packages/prompt_toolkit/shortcuts/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles +usr/lib/python3.10/site-packages/prompt_toolkit/styles/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/defaults.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/named_colors.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/pygments.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/style.py +usr/lib/python3.10/site-packages/prompt_toolkit/styles/style_transformation.py +usr/lib/python3.10/site-packages/prompt_toolkit/token.py +usr/lib/python3.10/site-packages/prompt_toolkit/utils.py +usr/lib/python3.10/site-packages/prompt_toolkit/validation.py +usr/lib/python3.10/site-packages/prompt_toolkit/widgets +usr/lib/python3.10/site-packages/prompt_toolkit/widgets/__init__.py +usr/lib/python3.10/site-packages/prompt_toolkit/widgets/base.py +usr/lib/python3.10/site-packages/prompt_toolkit/widgets/dialogs.py +usr/lib/python3.10/site-packages/prompt_toolkit/widgets/menus.py +usr/lib/python3.10/site-packages/prompt_toolkit/widgets/toolbars.py +usr/lib/python3.10/site-packages/prompt_toolkit/win32_types.py diff --git a/config/rootfiles/packages/python3-wcwidth b/config/rootfiles/packages/python3-wcwidth new file mode 100644 index 000000000..8dcee7940 --- /dev/null +++ b/config/rootfiles/packages/python3-wcwidth @@ -0,0 +1,20 @@ +#usr/lib/python3.10/site-packages/wcwidth +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info/METADATA +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info/RECORD +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info/WHEEL +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info/licenses +#usr/lib/python3.10/site-packages/wcwidth-0.3.1.dist-info/licenses/LICENSE +usr/lib/python3.10/site-packages/wcwidth/__init__.py +usr/lib/python3.10/site-packages/wcwidth/bisearch.py +usr/lib/python3.10/site-packages/wcwidth/control_codes.py +usr/lib/python3.10/site-packages/wcwidth/escape_sequences.py +usr/lib/python3.10/site-packages/wcwidth/grapheme.py +usr/lib/python3.10/site-packages/wcwidth/table_ambiguous.py +usr/lib/python3.10/site-packages/wcwidth/table_grapheme.py +usr/lib/python3.10/site-packages/wcwidth/table_vs16.py +usr/lib/python3.10/site-packages/wcwidth/table_wide.py +usr/lib/python3.10/site-packages/wcwidth/table_zero.py +usr/lib/python3.10/site-packages/wcwidth/textwrap.py +usr/lib/python3.10/site-packages/wcwidth/unicode_versions.py +usr/lib/python3.10/site-packages/wcwidth/wcwidth.py diff --git a/lfs/oci-cli b/lfs/oci-cli index 20cbfc237..a8998c1d8 100644 --- a/lfs/oci-cli +++ b/lfs/oci-cli @@ -32,10 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = oci-cli -PAK_VER = 5 +PAK_VER = 6 -DEPS = oci-python-sdk python3-arrow python3-jmespath python3-six \ - python3-terminaltables +DEPS = oci-python-sdk python3-arrow python3-jmespath \ + python3-prompt-toolkit python3-six python3-terminaltables ############################################################################### # Top-level Rules @@ -80,5 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && python3 setup.py build cd $(DIR_APP) && python3 setup.py install --root=/ + + # Run the help command just to make sure it works as we need to make + # sure that we have all required Python dependenices + oci --help + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python3-prompt-toolkit b/lfs/python3-prompt-toolkit new file mode 100644 index 000000000..c7f4ed7e6 --- /dev/null +++ b/lfs/python3-prompt-toolkit @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.0.52 + +THISAPP = prompt_toolkit-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-prompt-toolkit +PAK_VER = 1 + +DEPS = python3-wcwidth + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 7568bfc396bfe3b69028e199f7e6d2c04a35b76e682c3eff19be818f400614efde8fa06d9b058ee323b35fd960c27e8226dd243f65cd2d94a8788fdc0c111b31 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# 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 -m build --wheel --no-isolation + cd $(DIR_APP) && python3 -m install --destdir=/ dist/*.whl + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/python3-wcwidth b/lfs/python3-wcwidth new file mode 100644 index 000000000..4e47f5b9a --- /dev/null +++ b/lfs/python3-wcwidth @@ -0,0 +1,88 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.3.1 + +THISAPP = wcwidth-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-wcwidth +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = dca2e1458299b9dd76ee5abf23dbf42179c214a27d03e297bfed4e806367b17eb80adeb2d132b6af854c736ce566827fbd71700b6732665e75ccb6c264dbd9fb + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # ValueError: Unknown classifier in field `project.classifiers`: Programming Language :: Python :: 3.14 + cd $(DIR_APP) && sed -e "/3\.14/d" -i pyproject.toml + + # TypeError: Field `project.license-files` must be a table + cd $(DIR_APP) && sed -e "s/^license-files/#&/" -i pyproject.toml + + cd $(DIR_APP) && python3 -m build --wheel --no-isolation + cd $(DIR_APP) && python3 -m install --destdir=/ dist/*.whl + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index ed4222ac5..d9208d72a 100755 --- a/make.sh +++ b/make.sh @@ -2017,6 +2017,8 @@ build_system() { lfsmake2 python3-pyfuse3 lfsmake2 python3-pillow lfsmake2 python3-reportlab + lfsmake2 python3-wcwidth + lfsmake2 python3-prompt-toolkit lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli hooks/post-receive -- IPFire 2.x development tree