Development September 2023

development@lists.ipfire.org

10 participants
81 discussions

pakfire-builder problems after git pull
by Adolf Belka 02 Nov '23

02 Nov '23

Hi Michael, I just ran git pull which took me to commit build: Add implicit dist() when a makefile is passed -- followed by make and make install. Running pakfire-builder build beep/beep.nm gave the error message "Segmentation fault" Rolling back to cli: pakfire-builder: Implement "image create" then worked with beep fine. Then tried git pull, make, make install again and this time beep built without any problems. Then I tried sqlite and I got the segmentation fault again. Then I rolled back and sqlite built okay. Then ran sqlite again and this time part way through building my laptop logged out from my session. Logged back in and ran sqlite again and this after a short while everything froze and I had to reset the laptop. So rolling back to cli: pakfire-builder: Implement "image create" Does not stop the problem happening it just seems to show itself in different forms. I have now rolled back to cli: pakfire: Implement --yes which I think is where my last git pull had placed me. Running pakfire-builder on beep twice and sqlite four times has given no problems so that commit stage is confirmed good. Let me know if there is anything else I should try to narrow the problem down. Regards, Adolf. -- Sent from my laptop

3 16

[PATCH] unbound-dhcp-leases-bridge: Reload unbound to import leases
by Michael Tremer 26 Oct '23

26 Oct '23

This changes the old "diff" algorithm that we needed to have before Unbound was able to reload its own configuration. Now, it can do this even without dropping the cache. This should hopefully perform much better and be more reliable than the old way. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/unbound/unbound-dhcp-leases-bridge | 52 ++++------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index e89e0446b..e9f022aff 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -514,56 +514,19 @@ class UnboundConfigWriter(object): def __init__(self, path): self.path = path - self._cached_leases = [] - def update_dhcp_leases(self, leases): - # Find any leases that have expired or do not exist any more - # but are still in the unbound local data - removed_leases = [l for l in self._cached_leases if not l in leases] - - # Find any leases that have been added - new_leases = [l for l in leases if l not in self._cached_leases] - - # End here if nothing has changed - if not new_leases and not removed_leases: - return - # Write out all leases self.write_dhcp_leases(leases) - # Update unbound about changes - for l in removed_leases: - try: - for name, ttl, type, content in l.rrset: - log.debug("Removing records for %s" % name) - self._control("local_data_remove", name) - - # If the lease cannot be removed we will try the next one - except: - continue - - # If the removal was successful, we will remove it from the cache - else: - self._cached_leases.remove(l) - - for l in new_leases: - try: - for rr in l.rrset: - log.debug("Adding new record %s" % " ".join(rr)) - self._control("local_data", *rr) - - # If the lease cannot be added we will try the next one - except: - continue + log.debug("Reloading Unbound...") - # Add lease to cache when successfully added - else: - self._cached_leases.append(l) + # Reload the configuration without dropping the cache + self._control("reload_keep_cache") def write_dhcp_leases(self, leases): - with tempfile.NamedTemporaryFile(mode="w", delete=False) as f: - filename = f.name + log.debug("Writing DHCP leases...") + with tempfile.NamedTemporaryFile(mode="w", delete=False) as f: for l in leases: for rr in l.rrset: f.write("local-data: \"%s\"\n" % " ".join(rr)) @@ -571,7 +534,8 @@ class UnboundConfigWriter(object): # Make file readable for everyone os.fchmod(f.fileno(), stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) - os.rename(filename, self.path) + # Move the file to its destination + os.rename(f.name, self.path) def _control(self, *args): command = ["unbound-control"] @@ -585,7 +549,7 @@ class UnboundConfigWriter(object): log.critical("Could not run %s, error code: %s: %s" % ( " ".join(command), e.returncode, e.output)) - raise + raise e if __name__ == "__main__": -- 2.39.2

3 2

[PATCH] bind: Update to 9.16.44
by Matthias Fischer 09 Oct '23

09 Oct '23

For details see: https://downloads.isc.org/isc/bind9/9.16.44/doc/arm/html/notes.html#notes-f… Changes since 9.16.40: 9.16.44: "Previously, sending a specially crafted message over the control channel could cause the packet-parsing code to run out of available stack memory, causing named to terminate unexpectedly. This has been fixed. (CVE-2023-3341)" 9.16.43: "Processing already-queued queries received over TCP could cause an assertion failure, when the server was reconfigured at the same time or the cache was being flushed. This has been fixed." 9.16.42: "The overmem cleaning process has been improved, to prevent the cache from significantly exceeding the configured max-cache-size limit. (CVE-2023-2828) A query that prioritizes stale data over lookup triggers a fetch to refresh the stale data in cache. If the fetch is aborted for exceeding the recursion quota, it was possible for named to enter an infinite callback loop and crash due to stack overflow. This has been fixed. (CVE-2023-2911) Previously, it was possible for a delegation from cache to be returned to the client after the stale-answer-client-timeout duration. This has been fixed." 9.16.41: "When removing delegations from an opt-out range, empty-non-terminal NSEC3 records generated by those delegations were not cleaned up. This has been fixed." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index eeeee6e94..ca3f17011 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.40.so +usr/lib/libbind9-9.16.44.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.40.so +usr/lib/libdns-9.16.44.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.40.so +usr/lib/libirs-9.16.44.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.40.so +usr/lib/libisc-9.16.44.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.40.so +usr/lib/libisccc-9.16.44.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.40.so +usr/lib/libisccfg-9.16.44.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.40.so +usr/lib/libns-9.16.44.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index 850e3f93a..6779bb3d9 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.40 +VER = 9.16.44 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1ebfec11cc6902480113b1edadcbdb2f819050d779aaa1556ef79491c580a28106d3eff186da89bdecec03025e4e672342602f54e6b0e6f9619a181a1399e070 +$(DL_FILE)_BLAKE2 = cdca8289639d900ab8162e4b0252a495fa0c579b9399326c7df42699346c2f0bca24762dad29de187f142c0896f4012c3f5f3785126d325e7d30ccb73f1530d8 install : $(TARGET) -- 2.34.1

2 1

Errors when updating IPFire-3.x pakfire
by Adolf Belka 28 Sep '23

28 Sep '23

I did a git pull on my IPFire-3.x local repo and a lot of changes were uploaded. I then ran make -j$(nproc) and quite a few errors occurred. I then re-cloned the pakfire repo and went through the whole autogen.sh and configure with no problems but again with the make there were errors as below. Regards, Adolf make -j$(nproc) YACC src/libpakfire/parser/grammar.c updating src/libpakfire/parser/grammar.h make --no-print-directory all-recursive Making all in . LEX src/libpakfire/parser/scanner.c CC src/libpakfire/libpakfire_la-arch.lo CC src/libpakfire/libpakfire_la-archive.lo CC src/libpakfire/libpakfire_la-build.lo CC src/libpakfire/libpakfire_la-cgroup.lo CC src/libpakfire/libpakfire_la-compress.lo CC src/libpakfire/libpakfire_la-config.lo CC src/libpakfire/libpakfire_la-db.lo CC src/libpakfire/libpakfire_la-dependencies.lo CC src/libpakfire/libpakfire_la-digest.lo CC src/libpakfire/libpakfire_la-dist.lo CC src/libpakfire/libpakfire_la-downloader.lo CC src/libpakfire/libpakfire_la-fhs.lo CC src/libpakfire/libpakfire_la-file.lo src/libpakfire/file.c:90:10: warning: #warning TODO data [-Wcpp] 90 | #warning TODO data | ^~~~~~~ CC src/libpakfire/libpakfire_la-filelist.lo src/libpakfire/file.c: In function '__pakfire_file_check_cf_protection_aarch64': src/libpakfire/file.c:2695:11: warning: #warning TODO [-Wcpp] 2695 | # warning TODO | ^~~~~~~ CC src/libpakfire/libpakfire_la-jail.lo CC src/libpakfire/libpakfire_la-key.lo CC src/libpakfire/libpakfire_la-linter.lo CC src/libpakfire/libpakfire_la-logging.lo CC src/libpakfire/libpakfire_la-mount.lo CC src/libpakfire/libpakfire_la-package.lo CC src/libpakfire/libpakfire_la-packager.lo CC src/libpakfire/libpakfire_la-packagelist.lo CC src/libpakfire/libpakfire_la-pakfire.lo CC src/libpakfire/libpakfire_la-parser.lo CC src/libpakfire/libpakfire_la-problem.lo CC src/libpakfire/libpakfire_la-progressbar.lo CC src/libpakfire/libpakfire_la-pwd.lo CC src/libpakfire/libpakfire_la-repo.lo CC src/libpakfire/libpakfire_la-repolist.lo CC src/libpakfire/libpakfire_la-scriptlet.lo CC src/libpakfire/libpakfire_la-snapshot.lo CC src/libpakfire/libpakfire_la-solution.lo CC src/libpakfire/libpakfire_la-string.lo CC src/libpakfire/libpakfire_la-transaction.lo CC src/libpakfire/libpakfire_la-ui.lo src/libpakfire/ui.c:91:34: warning: 'pakfire_ui_append_solution' defined but not used [-Wunused-function] 91 | static struct pakfire_solution** pakfire_ui_append_solution( | ^~~~~~~~~~~~~~~~~~~~~~~~~~ src/libpakfire/ui.c:44:12: warning: 'pakfire_ui_enter_number' defined but not used [-Wunused-function] 44 | static int pakfire_ui_enter_number(struct pakfire* pakfire, const char* question, | ^~~~~~~~~~~~~~~~~~~~~~~ CC src/libpakfire/libpakfire_la-util.lo CC src/libpakfire/parser/libpakfire_parser_la-grammar.lo CC src/libpakfire/parser/libpakfire_parser_la-scanner.lo CC src/libpakfire/libpakfire_internal_la-arch.lo CC src/libpakfire/libpakfire_internal_la-archive.lo CC src/libpakfire/libpakfire_internal_la-build.lo CC src/libpakfire/libpakfire_internal_la-cgroup.lo CC src/libpakfire/libpakfire_internal_la-compress.lo CC src/libpakfire/libpakfire_internal_la-config.lo CC src/libpakfire/libpakfire_internal_la-db.lo CC src/libpakfire/libpakfire_internal_la-dependencies.lo CC src/libpakfire/libpakfire_internal_la-digest.lo CC src/libpakfire/libpakfire_internal_la-dist.lo CC src/libpakfire/libpakfire_internal_la-downloader.lo CC src/libpakfire/libpakfire_internal_la-fhs.lo CC src/libpakfire/libpakfire_internal_la-file.lo src/libpakfire/file.c:90:10: warning: #warning TODO data [-Wcpp] 90 | #warning TODO data | ^~~~~~~ CC src/libpakfire/libpakfire_internal_la-filelist.lo src/libpakfire/file.c: In function '__pakfire_file_check_cf_protection_aarch64': src/libpakfire/file.c:2695:11: warning: #warning TODO [-Wcpp] 2695 | # warning TODO | ^~~~~~~ CC src/libpakfire/libpakfire_internal_la-jail.lo CC src/libpakfire/libpakfire_internal_la-key.lo CC src/libpakfire/libpakfire_internal_la-linter.lo CC src/libpakfire/libpakfire_internal_la-logging.lo CC src/libpakfire/libpakfire_internal_la-mount.lo CC src/libpakfire/libpakfire_internal_la-package.lo CC src/libpakfire/libpakfire_internal_la-packager.lo CC src/libpakfire/libpakfire_internal_la-packagelist.lo CC src/libpakfire/libpakfire_internal_la-pakfire.lo CC src/libpakfire/libpakfire_internal_la-parser.lo CC src/libpakfire/libpakfire_internal_la-problem.lo CC src/libpakfire/libpakfire_internal_la-progressbar.lo CC src/libpakfire/libpakfire_internal_la-pwd.lo CC src/libpakfire/libpakfire_internal_la-repo.lo CC src/libpakfire/libpakfire_internal_la-repolist.lo CC src/libpakfire/libpakfire_internal_la-scriptlet.lo CC src/libpakfire/libpakfire_internal_la-snapshot.lo CC src/libpakfire/libpakfire_internal_la-solution.lo CC src/libpakfire/libpakfire_internal_la-string.lo CC src/libpakfire/libpakfire_internal_la-transaction.lo CC src/libpakfire/libpakfire_internal_la-ui.lo src/libpakfire/ui.c:91:34: warning: 'pakfire_ui_append_solution' defined but not used [-Wunused-function] 91 | static struct pakfire_solution** pakfire_ui_append_solution( | ^~~~~~~~~~~~~~~~~~~~~~~~~~ src/libpakfire/ui.c:44:12: warning: 'pakfire_ui_enter_number' defined but not used [-Wunused-function] 44 | static int pakfire_ui_enter_number(struct pakfire* pakfire, const char* question, | ^~~~~~~~~~~~~~~~~~~~~~~ CC src/libpakfire/libpakfire_internal_la-util.lo CCLD libpakfire-parser.la CC src/cli/lib/libcli_la-command.lo CC src/cli/lib/libcli_la-dump.lo src/cli/lib/dump.c: In function 'cli_dump_packagelist': src/cli/lib/dump.c:53:16: warning: implicit declaration of function 'pakfire_packagelist_walk'; did you mean 'pakfire_packagelist_push'? [-Wimplicit-function-declaration] 53 | return pakfire_packagelist_walk(list, __cli_dump_package, &flags); | ^~~~~~~~~~~~~~~~~~~~~~~~ | pakfire_packagelist_push src/cli/lib/dump.c:53:16: warning: nested extern declaration of 'pakfire_packagelist_walk' [-Wnested-externs] CCLD libpakfire.la GEN src/scripts/pakfire-builder GEN src/scripts/pakfire-client GEN src/scripts/pakfire-daemon ASCIIDOC man/pakfire.xml ASCIIDOC man/pakfire-archive-format.xml ASCIIDOC man/pakfire-deps.xml GEN src/systemd/pakfire-daemon.service CC src/cli/pakfire/pakfire-main.o CC src/cli/pakfire/pakfire-check.o CC src/cli/pakfire/pakfire-clean.o CC src/cli/pakfire/pakfire-info.o CC src/cli/pakfire/pakfire-install.o src/cli/pakfire/install.c: In function ‘parse_argv’: src/cli/pakfire/install.c:77:53: error: ‘PAKFIRE_JOB_BEST’ undeclared (first use in this function) 77 | config.job_flags |= PAKFIRE_JOB_BEST; | ^~~~~~~~~~~~~~~~ src/cli/pakfire/install.c:77:53: note: each undeclared identifier is reported only once for each function it appears in src/cli/pakfire/install.c:81:61: error: ‘PAKFIRE_TRANSACTION_ALLOW_DOWNGRADE’ undeclared (first use in this function) 81 | config.transaction_flags |= PAKFIRE_TRANSACTION_ALLOW_DOWNGRADE; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC src/cli/pakfire/pakfire-provides.o src/cli/pakfire/install.c:85:61: error: ‘PAKFIRE_TRANSACTION_ALLOW_UNINSTALL’ undeclared (first use in this function) 85 | config.transaction_flags |= PAKFIRE_TRANSACTION_ALLOW_UNINSTALL; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/cli/pakfire/install.c:89:61: error: ‘PAKFIRE_TRANSACTION_WITHOUT_RECOMMENDED’ undeclared (first use in this function) 89 | config.transaction_flags |= PAKFIRE_TRANSACTION_WITHOUT_RECOMMENDED; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/cli/pakfire/install.c: In function ‘cli_install’: src/cli/pakfire/install.c:115:13: warning: implicit declaration of function ‘pakfire_transaction_create’; did you mean ‘pakfire_transaction_count’? [-Wimplicit-function-declaration] 115 | r = pakfire_transaction_create(&transaction, pakfire, config.transaction_flags); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | pakfire_transaction_count src/cli/pakfire/install.c:115:13: warning: nested extern declaration of ‘pakfire_transaction_create’ [-Wnested-externs] src/cli/pakfire/install.c:123:21: warning: implicit declaration of function ‘pakfire_transaction_request’; did you mean ‘pakfire_transaction_run’? [-Wimplicit-function-declaration] 123 | r = pakfire_transaction_request(transaction, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | pakfire_transaction_run src/cli/pakfire/install.c:123:21: warning: nested extern declaration of ‘pakfire_transaction_request’ [-Wnested-externs] src/cli/pakfire/install.c:124:33: error: ‘PAKFIRE_JOB_INSTALL’ undeclared (first use in this function); did you mean ‘PAKFIRE_CLI_INSTALL_H’? 124 | PAKFIRE_JOB_INSTALL, argv[i], config.job_flags); | ^~~~~~~~~~~~~~~~~~~ | PAKFIRE_CLI_INSTALL_H src/cli/pakfire/install.c:132:13: warning: implicit declaration of function ‘pakfire_transaction_solve’; did you mean ‘pakfire_transaction_count’? [-Wimplicit-function-declaration] 132 | r = pakfire_transaction_solve(transaction, 0, &problems); | ^~~~~~~~~~~~~~~~~~~~~~~~~ | pakfire_transaction_count src/cli/pakfire/install.c:132:13: warning: nested extern declaration of ‘pakfire_transaction_solve’ [-Wnested-externs] src/cli/pakfire/install.c:144:13: error: too few arguments to function ‘pakfire_transaction_run’ 144 | r = pakfire_transaction_run(transaction); | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from src/cli/pakfire/install.c:26: /usr/include/pakfire/transaction.h:39:5: note: declared here 39 | int pakfire_transaction_run(struct pakfire_transaction* transaction, int flags); | ^~~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [Makefile:3842: src/cli/pakfire/pakfire-install.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile:4602: all-recursive] Error 1 make: *** [Makefile:2118: all] Error 2 -- Sent from my laptop

2 4

Problem with qemu from CU179
by Adolf Belka 28 Sep '23

28 Sep '23

Hi All, In qemu 7.2 they removed the bundled slirp library. This is used for the net user backend and is used by default if nothing else is specified. The example in the wiki uses the net user. Unfortunately it looks like nobody ran qemu in testing for CU179. A user on the forum has run into this problem and it stops his qemu system from running. I will do a new build of qemu/qemu-ga (updated to 8.1.1) which will include the libslirp package tomorrow (28th Sep). Hopefully the patch submission that I make for this will be able to be merged into CU180 Testing. Regards, Adolf. -- Sent from my laptop

2 5

[PATCH 1/3] qemu: Update to version 8.1.1 and add libslirp for net user backend
by Adolf Belka 28 Sep '23

28 Sep '23

- Update from version 8.0.3 to 8.1.1 - In CU179 the update of qemu caused at least one user to have a problem starting his qemu system as the qemu bundled slirp library used for the net user backend was removed in version 7.2. Unfortunately no user tested qemu in the CU179 Testing phase, or if they did they are not using the net user backend. - This patch adds the --enable-slirp option to configure and installs libslirp in a separate patch. - I can't test if this now works as I don't use qemu anywhere. - Changelog is too large to include here. 8.1 https://wiki.qemu.org/ChangeLog/8.1 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/qemu | 5 +++++ lfs/qemu | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e69e28322..efc0cbd2e 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -18,7 +18,12 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 +#usr/include/fdt.h +#usr/include/libfdt.h +#usr/include/libfdt_env.h usr/include/qemu-plugin.h +#usr/lib/libfdt.a +#usr/lib/pkgconfig/libfdt.pc usr/libexec/qemu-bridge-helper #usr/share/applications/qemu.desktop #usr/share/icons/hicolor/128x128/apps/qemu.png diff --git a/lfs/qemu b/lfs/qemu index 8af87e75e..1e46f14a1 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -27,7 +27,7 @@ include Config SUMMARY = Machine emulator and virtualizer # If you update the version also qemu-ga !!! -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 39 +PAK_VER = 40 -DEPS = alsa elfutils libusbredir spice libseccomp +DEPS = alsa elfutils libusbredir spice libseccomp libslirp SERVICES = @@ -61,7 +61,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 +$(DL_FILE)_BLAKE2 = 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340 install : $(TARGET) @@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-usb-redir \ --enable-seccomp \ --disable-docs \ - --disable-sdl + --disable-sdl \ + --enable-slirp cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.42.0

1 2

Info on problems with python3-setuptools for IPFire-3.x
by Adolf Belka 28 Sep '23

28 Sep '23

Hi All, The IPFire-3.x version of python3-setuptools is quite old so I thought I would have a go at updating it but had a few problems on the way. Running the existing version for 65.6.3 results in Building python3-setuptools-65.6.3-1.ipfire3.src... python3-setuptools-65.6.3-1.ipfire3.src does not support being built on x86_64 OSError: [Errno 0] Error Removing the line from the build section that has arches = noarch stops that error occurring. Most of the other python3 .nm files don't have that arches line present. Trying to then run version 68.2.2 resulted in the error Could not add 'setuptools-68.2.2.tar.gz' to package: Success Testing out the download url I found that it works with version 65.6.3 but not with 68.2.2. Looking at the download from PyPI I found that other parts of the download url are changed for different versions of the same package. The download url for 65.6.3 and for 68.2.2 are shown below for comparison https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884… https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e63… The above means that each time the version number is changed the download url will also need to be manually edited for all downloads from PyPI. After changing the download url then the package downloaded and was successfully built. Regards, Adolf. -- Sent from my laptop

2 1

[PATCH] extrahd: add forgotten udev_event handler to mount partitions via udev
by Arne Fitzenreiter 28 Sep '23

28 Sep '23

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/extrahd/extrahd.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl index cc85228d5..bcde077d0 100644 --- a/config/extrahd/extrahd.pl +++ b/config/extrahd/extrahd.pl @@ -116,7 +116,21 @@ extrahd_umount() { done < /var/ipfire/extrahd/devices } +handle_udev_event() { + case "${ACTION}" in + add) + if [ -n "${ID_FS_UUID}" ]; then + extrahd_mount "UUID=${ID_FS_UUID}" || return $? + fi + ;; + esac + + return 0 +} + main() { + ( echo "$@"; set ) > /tmp/extrahd.$$ + local command="${1}" shift @@ -129,6 +143,9 @@ main() { umount) extrahd_umount "${@}" || rc="${rc}" ;; + udev-event) + handle_udev_event "${@}" || rc="${rc}" + ;; scanhd) exec /usr/local/bin/scanhd "${@}" ;; -- 2.38.1

2 1

[PATCH 1/6] ovpnmain.cgi: Fix for bug#11048 - insecure download icon shown for connections with a password
by Adolf Belka 28 Sep '23

28 Sep '23

- At long last I have re-visited the patch submission for bug #11048 and fixed the issues that caused the problems last time I evaluated it in Testing. - The insecure package download icon is shown if entry 41 in /var/ipfire/ovpn/ovpnconfig is set to no-pass. The code block on ovpnmain.cgi that deals with this checks if the connection is a host and if the first password entry is a null. Then it adds no-pass to ovpnconfig. - The same block of code is also used for when he connection is edited. However at this stage the password entry is back to null because the password value is only kept until the connection has been saved. Therefore doing an edit results in the password value being taken as null even for connections with a password. - This fix enters no-pass if the connection type is host and the password is null, pass if the connection type is host and the password has characters. If the connection type is net then no-pass is used as net2net connections dop not have encrypted certificates. - The code has been changed to show a different icon for unencrypted and encrypted certificates. - Separate patches are provided for the language file change, the provision of a new icon and the code for the update.sh script for the Core Update to update all existing connections, if any exist, to have either pass or no-pass in index 41. - This patch set was a joint collaboration between Erik Kapfer and Adolf Belka - Patch set, including the code for the Core Update 180 update.sh script has been tested on a vm testbed Fixes: Bug#11048 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Suggested-by: Adolf Belka <adolf.belka(a)ipfire.org> Suggested-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 75 +++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5afe54f55..eb89c5095 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4370,9 +4370,15 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; - if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { - $confighash{$key}[41] = "no-pass"; - } + if ($confighash{$key}[41] eq "") { + if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { + $confighash{$key}[41] = "no-pass"; + } elsif (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} ne "")) { + $confighash{$key}[41] = "pass"; + } elsif ($cgiparams{'TYPE'} eq 'net') { + $confighash{$key}[41] = "no-pass"; + } + } $confighash{$key}[42] = 'HOTP/T30/6'; $confighash{$key}[43] = $cgiparams{'OTP_STATE'}; @@ -5512,20 +5518,24 @@ END } - print <<END; - <td align='center' $col1>$active</td> + if ($confighash{$key}[41] eq "pass") { + print <<END; + <td align='center' $col1>$active</td> - <form method='post' name='frm${key}a'><td align='center' $col> - <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> - <input type='hidden' name='KEY' value='$key' /> - </td></form> + <form method='post' name='frm${key}a'><td align='center' $col> + <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn_encrypted.png' + alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> + <input type='hidden' name='MODE' value='secure' /> + <input type='hidden' name='KEY' value='$key' /> + </td></form> END - ; - if ($confighash{$key}[41] eq "no-pass") { + ; } elsif ($confighash{$key}[41] eq "no-pass") { print <<END; - <form method='post' name='frm${key}g'><td align='center' $col> + <td align='center' $col1>$active</td> + + <form method='post' name='frm${key}a'><td align='center' $col> <input type='image' name='$Lang::tr{'dl client arch insecure'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch insecure'}' title='$Lang::tr{'dl client arch insecure'}' border='0' /> <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> @@ -5533,7 +5543,7 @@ END <input type='hidden' name='KEY' value='$key' /> </td></form> END - } else { + ; } else { print "<td $col> </td>"; } @@ -5609,30 +5619,33 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END; - <table border='0'> - <tr> + <table width='85%' border='0'> + <tr> <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> - <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> - <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/openvpn.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch insecure'}</td> + <td>    <img src='/images/openvpn_encrypted.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch'}</td> <td>    <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td> <td class='base'>$Lang::tr{'show certificate'}</td> + <td>    <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> + <td class='base'>$Lang::tr{'show otp qrcode'}</td> + </tr> + <tr> + <td>  </td> + <td>    <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> + <td class='base'>$Lang::tr{'download certificate'}</td> + <td>  <img src='/images/off.gif' alt='?OFF' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> <td class='base'>$Lang::tr{'edit'}</td> <td>    <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> <td class='base'>$Lang::tr{'remove'}</td> - </tr> - <tr> - <td>  </td> - <td>  <img src='/images/off.gif' alt='?OFF' /></td> - <td class='base'>$Lang::tr{'click to enable'}</td> - <td>    <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> - <td class='base'>$Lang::tr{'download certificate'}</td> - <td>    <img src='/images/openvpn.png' alt='?RELOAD'/></td> - <td class='base'>$Lang::tr{'dl client arch'}</td> - <td>    <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> - <td class='base'>$Lang::tr{'show otp qrcode'}</td> - </tr> - </table><br> + </tr> + </table><br> END ; } -- 2.42.0

2 7

Problem building a python3 package in IPFire3
by Adolf Belka 28 Sep '23

28 Sep '23

Hi All, I was looking at updating python3-markdown in IPFire3. However that version no longer has a setup.py file. It only has a pyproject.toml file. In IPFire2 we dealt with that by installing python3-build which had a setup.py file and then using python3 -m build \ --no-isolation \ --wheel for the build part and pip3 install \ --no-build-isolation \ --root="/" \ --no-deps \ --ignore-installed \ dist/*.whl for the install part. However build is now version 1.0.3 and since version 1.0.0 it no longer has a setup.py file in it, only a pyproject.toml file and you can't use build to build build until build has been installed!!!!! The instructions for build says that you have to use pip to install build, although it is not clear if that will work without internet. The above build and install worked for IPFire2 because the build stage used python3-build to create a wheel from the source file and then pip to install the generated wheel file and none of that needed to load things from the internet. I am not sure how to deal with this now. This will also be a problem for IPFire2 if we want to bring the various python3 packages up to date. I had a look at what Arch Linux were doing to build the python3-build package and they have a makedepends of python-build to build python-build, which I don't understand how it would work. Looking forward to any suggestions. Regards, Adolf. -- Sent from my laptop

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2023