From 7877690d99748e6c92751bcfcfe2b86981535439 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 4 Sep 2023 21:20:14 +0800 Subject: [PATCH 01/16] firefox: Remove zip dependency, and demote yasm to optional I can build it w/o zip and I cannot see how zip is used. And yasm is only used for building shipped libvpx, but we are recommending system libvpx anyway. --- xsoft/graphweb/firefox.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index fc5fd477eb..9401bfac09 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -146,10 +146,8 @@ tar: Exiting with failure status due to previous errors now deprecated by mozilla), in either case please read the Configuration Information, (rebuilt after installing ), - , - , - , and - + , and + Recommended @@ -180,6 +178,7 @@ tar: Exiting with failure status due to previous errors , , , + , libproxy From 291b865a13af347337fa6cac907d14583dbafb32 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 4 Sep 2023 23:42:23 +0800 Subject: [PATCH 02/16] thunderbird: Remove zip dependency and unneeded sed By the way, remove a lot of stale (commented out) hot fixes. --- xsoft/other/thunderbird.xml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml index 95c383fc09..f8d94589fc 100644 --- a/xsoft/other/thunderbird.xml +++ b/xsoft/other/thunderbird.xml @@ -86,8 +86,7 @@ (or if you edit the mozconfig; although it is now deprecated by mozilla), (rebuilt with the sqlite module), - , - , and + , and @@ -202,35 +201,6 @@ ac_add_options --with-system-zlib # and was reported to seriously slow the build. Disable it. ac_add_options --without-wasm-sandboxed-libraries EOF - - - - - Fix an issue occurring when building with GCC-13: - - -sed -e '/<exception>/i#include <cstdint>' \ - -i comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h Now invoke the Python mach script to compile From 808aeec3d8920de7ee8c3b90ee3adafe34074c9b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 4 Sep 2023 23:50:51 +0800 Subject: [PATCH 03/16] rust: Update to rustc-1.72.0 --- general/prog/rust.xml | 18 +++++++++--------- packages.ent | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/general/prog/rust.xml b/general/prog/rust.xml index 3ee7c97802..e1eb9e6534 100644 --- a/general/prog/rust.xml +++ b/general/prog/rust.xml @@ -6,7 +6,7 @@ - + @@ -76,7 +76,7 @@ However it can be mostly limited to a specified number of processors by a combination of adding the switch --jobs <N> (e.g. '--jobs 4' to limit to 4 processors) on each invocation of - python3 ./x.py and using an + python3 x.py and using an environment variable CARGO_BUILD_JOBS=<N>. At the moment this is not effective when some of the rustc tests are run. @@ -312,9 +312,7 @@ llvm-config = "/usr/bin/llvm-config" [target.i686-unknown-linux-gnu] # NB the output of llvm-config (i.e. help options) may be # dumped to the screen when config.toml is parsed. -llvm-config = "/usr/bin/llvm-config" - - +llvm-config = "/usr/bin/llvm-config" EOF diff --git a/packages.ent b/packages.ent index 695423e5d4..3c5539fe42 100644 --- a/packages.ent +++ b/packages.ent @@ -346,7 +346,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + From ce49f79e46031cbfee960c687f960a5462a9dec3 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 5 Sep 2023 00:14:25 +0800 Subject: [PATCH 04/16] cbindgen: Update to cbindgen-0.25.0 --- general/prog/cbindgen.xml | 10 ++++------ packages.ent | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/general/prog/cbindgen.xml b/general/prog/cbindgen.xml index df49be0fcb..7a38714f7a 100644 --- a/general/prog/cbindgen.xml +++ b/general/prog/cbindgen.xml @@ -4,10 +4,10 @@ %general-entities; - + - - + + ]> @@ -87,10 +87,8 @@ cargo build --release - To test the results, issue: cargo test. - Three tests in the final suite are known to fail. + Three tests in profile.rs are known to fail. diff --git a/packages.ent b/packages.ent index 3c5539fe42..458345a095 100644 --- a/packages.ent +++ b/packages.ent @@ -308,7 +308,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + From 1384f36a8c77aa8a583d2d4aa8d8361ae41faf57 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 5 Sep 2023 00:19:43 +0800 Subject: [PATCH 05/16] changelog: Add change log entires for rustc-1.72.0 and cbindgen-0.25.0 --- introduction/welcome/changelog.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 140506cbbb..5ff23a9300 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,14 @@ September 4th, 2023 + + [xry111] - Update to cbindgen-0.25.0. Fixes + #18467. + + + [xry111] - Update to rustc-1.72.0. Fixes + #18456. + [rahul] - Update to libnl-3.8.0. Fixes #18476. From cecc78a796169c1e35c78f2a3c486628e99602ca Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Mon, 4 Sep 2023 18:47:06 +0200 Subject: [PATCH 06/16] Make groupadd command in mutt "nodump" Normally, the "mail" group should have been created in lfs, so no need to create it here. But this instruction has been here for so long that we could as well keep it. Nevertheless prevent jhalfs to choke on it. --- networking/mailnews/mutt.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/networking/mailnews/mutt.xml b/networking/mailnews/mutt.xml index 4d334beebc..74ed1b12b7 100644 --- a/networking/mailnews/mutt.xml +++ b/networking/mailnews/mutt.xml @@ -145,10 +145,11 @@ Mutt requires a group named mail. You can - add this group, if it does not exist, with this command: + add this group, if it does not exist, with this command + (as the &root; user): - -groupadd -g 34 mail + +groupadd -g 34 mail If you did not install an , you need to From f7fe3e6aed4d2ebc7a613c415f43f13a7b7d31f7 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Mon, 4 Sep 2023 13:33:48 -0500 Subject: [PATCH 07/16] Typo fixes from Julien Lepiller --- general/prog/python3.xml | 2 +- postlfs/security/shadow.xml | 2 +- xsoft/graphweb/firefox.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/general/prog/python3.xml b/general/prog/python3.xml index 17db821a83..13e0650b3e 100644 --- a/general/prog/python3.xml +++ b/general/prog/python3.xml @@ -173,7 +173,7 @@ make To test the result, issue make test. - Some tests may need an Internet connection. One tests, test_distutils + Some tests may need an Internet connection. One test, test_distutils, is known to fail. diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml index 29982a5cdf..dcb99c1e89 100644 --- a/postlfs/security/shadow.xml +++ b/postlfs/security/shadow.xml @@ -9,7 +9,7 @@ - + ]> diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index 9401bfac09..c788e942c1 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -156,7 +156,7 @@ tar: Exiting with failure status due to previous errors , , , - , + , and From 38022152f7b28eaf2431ec20051c1e577fc6b4c2 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 14:58:46 -0500 Subject: [PATCH 08/16] Archive librep to go with previous archiving of sawfish --- {general/prog => archive}/librep.xml | 0 general/prog/prog.xml | 2 +- introduction/welcome/changelog.xml | 2 +- postlfs/security/gpgme.xml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {general/prog => archive}/librep.xml (100%) diff --git a/general/prog/librep.xml b/archive/librep.xml similarity index 100% rename from general/prog/librep.xml rename to archive/librep.xml diff --git a/general/prog/prog.xml b/general/prog/prog.xml index 15557368e1..2f2f2b9918 100644 --- a/general/prog/prog.xml +++ b/general/prog/prog.xml @@ -34,7 +34,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 5ff23a9300..d528df966b 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -69,7 +69,7 @@ September 3rd, 2023 - [bdubbs] - Archive sawfish and its dependency rep-gtk. Fixes + [bdubbs] - Archive sawfish and its dependencies rep-gtk and librep. Fixes #18453. diff --git a/postlfs/security/gpgme.xml b/postlfs/security/gpgme.xml index c73ce8ba91..17979a0017 100644 --- a/postlfs/security/gpgme.xml +++ b/postlfs/security/gpgme.xml @@ -117,7 +117,7 @@ so do not advertise python2 https://github.com/gpg/gpgme/commit/24a8c279da98fe7e586a9fc3cd91175c9e60ffef --> mkdir build && -cd build && +cd build && ../configure --prefix=/usr --disable-gpg-test && make PYTHONS= From 9d7f370cb13c64bbc60685216d85870e17482697 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 15:14:55 -0500 Subject: [PATCH 09/16] Reformat bubblewrap --- general/sysutils/bubblewrap.xml | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/general/sysutils/bubblewrap.xml b/general/sysutils/bubblewrap.xml index 9177a5aacd..07089e81f2 100644 --- a/general/sysutils/bubblewrap.xml +++ b/general/sysutils/bubblewrap.xml @@ -79,6 +79,26 @@ + + Kernel Configuration + + + When this package began, upstream expected it could be installed + suid-root. That was a long time ago, suid-root is generally considered + a bad idea. As well as the default namespaces, this package requires the + optional User namespace to be enabled. If that has not yet been enabled, + select the following option in the kernel configuration and recompile the + kernel: + + + + + + bubblewrap + + + Installation of Bubblewrap @@ -120,26 +140,6 @@ ninja href="../../xincludes/meson-buildtype-release.xml"/> - - Kernel Configuration - - - When this package began, upstream expected it could be installed - suid-root. That was a long time ago, suid-root is generally considered - a bad idea. As well as the default namespaces, this package requires the - optional User namespace to be enabled. If that has not yet been enabled, - select the following option in the kernel configuration and recompile the - kernel: - - - - - - bubblewrap - - - Contents From 66a318cc6d0df3fd9e5b61d520b8fa3cfd024e81 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 16:52:18 -0500 Subject: [PATCH 10/16] Update to freetype-2.13.2. --- general/graphlib/freetype2.xml | 6 +++--- introduction/welcome/changelog.xml | 4 ++++ packages.ent | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/general/graphlib/freetype2.xml b/general/graphlib/freetype2.xml index d6b539f6b2..3e1a6c7d2b 100644 --- a/general/graphlib/freetype2.xml +++ b/general/graphlib/freetype2.xml @@ -6,15 +6,15 @@ - + - + - + ]> diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index d528df966b..0b17da92d0 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,10 @@ September 4th, 2023 + + [bdubbs] - Update to freetype-2.13.2. Fixes + #18461. + [xry111] - Update to cbindgen-0.25.0. Fixes #18467. diff --git a/packages.ent b/packages.ent index 458345a095..5b5387124c 100644 --- a/packages.ent +++ b/packages.ent @@ -197,7 +197,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + From dc7804f9f253c654496ebffb025028a469fd22b4 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 17:00:32 -0500 Subject: [PATCH 11/16] Update to xf86-input-libinput-1.4.0. --- introduction/welcome/changelog.xml | 4 ++++ x/installing/x7driver-libinput.xml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 0b17da92d0..d9351a1905 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,10 @@ September 4th, 2023 + + [bdubbs] - Update to xf86-input-libinput-1.4.0. Fixes + #18463. + [bdubbs] - Update to freetype-2.13.2. Fixes #18461. diff --git a/x/installing/x7driver-libinput.xml b/x/installing/x7driver-libinput.xml index e25bca3b3b..c746b67370 100644 --- a/x/installing/x7driver-libinput.xml +++ b/x/installing/x7driver-libinput.xml @@ -4,13 +4,13 @@ %general-entities; - + - + - + ]> From 8ff79c8e8300599af0fb335dff4107019cede1bd Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 17:05:26 -0500 Subject: [PATCH 12/16] Update to highlight-4.8. --- general/genutils/highlight.xml | 2 +- introduction/welcome/changelog.xml | 4 ++++ packages.ent | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/general/genutils/highlight.xml b/general/genutils/highlight.xml index 0b98ff9e0a..3cafe9c553 100644 --- a/general/genutils/highlight.xml +++ b/general/genutils/highlight.xml @@ -6,7 +6,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index d9351a1905..bb94e26b75 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,10 @@ September 4th, 2023 + + [bdubbs] - Update to highlight-4.8. Fixes + #18470. + [bdubbs] - Update to xf86-input-libinput-1.4.0. Fixes #18463. diff --git a/packages.ent b/packages.ent index 5b5387124c..3960e42b8c 100644 --- a/packages.ent +++ b/packages.ent @@ -246,7 +246,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + From 69e716244c4b896c333f2a7e941b6a0ab92b43eb Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 17:14:44 -0500 Subject: [PATCH 13/16] Update to xscreensaver-6.07. --- introduction/welcome/changelog.xml | 4 ++++ packages.ent | 2 +- xsoft/other/xscreensaver.xml | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index bb94e26b75..2d22be3cf8 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,10 @@ September 4th, 2023 + + [bdubbs] - Update to xscreensaver-6.07. Fixes + #18483. + [bdubbs] - Update to highlight-4.8. Fixes #18470. diff --git a/packages.ent b/packages.ent index 3960e42b8c..5e9ebabd92 100644 --- a/packages.ent +++ b/packages.ent @@ -1009,7 +1009,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + diff --git a/xsoft/other/xscreensaver.xml b/xsoft/other/xscreensaver.xml index 927582776c..d30a4c62df 100644 --- a/xsoft/other/xscreensaver.xml +++ b/xsoft/other/xscreensaver.xml @@ -6,9 +6,9 @@ - + - + ]> @@ -90,6 +90,7 @@ Optional , + , , , and GLE From 407c671a8a1c38cf0dfa865437012f6630e1d574 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 4 Sep 2023 17:32:01 -0500 Subject: [PATCH 14/16] Update to libblockdev-3.0.3. Also archive volume_key. --- {postlfs/security => archive}/volume_key.xml | 0 general/genlib/libblockdev.xml | 11 +++++------ introduction/welcome/changelog.xml | 8 ++++++++ packages.ent | 4 ++-- postlfs/security/security.xml | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) rename {postlfs/security => archive}/volume_key.xml (100%) diff --git a/postlfs/security/volume_key.xml b/archive/volume_key.xml similarity index 100% rename from postlfs/security/volume_key.xml rename to archive/volume_key.xml diff --git a/general/genlib/libblockdev.xml b/general/genlib/libblockdev.xml index 7212af9f41..78440863c6 100644 --- a/general/genlib/libblockdev.xml +++ b/general/genlib/libblockdev.xml @@ -7,9 +7,9 @@ - + - + ]> @@ -93,7 +93,8 @@ , , , - , + volume_key, + ndctl, and @@ -148,9 +149,7 @@ make --without-escrow: This switch allows building - libblockdev without - installed. Remove it if you've installed - . + libblockdev without volume_key installed. diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 2d22be3cf8..8151e17abf 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,14 @@ September 4th, 2023 + + [bdubbs] - Archive volume_key. Fixes + #18487. + + + [bdubbs] - Update to libblockdev-3.0.3. Fixes + #18490. + [bdubbs] - Update to xscreensaver-6.07. Fixes #18483. diff --git a/packages.ent b/packages.ent index 5e9ebabd92..2e53dd953c 100644 --- a/packages.ent +++ b/packages.ent @@ -38,7 +38,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/postlfs/security/security.xml b/postlfs/security/security.xml index aeb53e3ed1..6c73dbfb2b 100644 --- a/postlfs/security/security.xml +++ b/postlfs/security/security.xml @@ -86,7 +86,7 @@ - + - - + + diff --git a/x/lib/at-spi2-core.xml b/x/lib/at-spi2-core.xml index 1f749e8f85..2bd11bef8e 100644 --- a/x/lib/at-spi2-core.xml +++ b/x/lib/at-spi2-core.xml @@ -8,10 +8,10 @@ "&gnome-download-http;/at-spi2-core/2.48/at-spi2-core-&at-spi2-core-version;.tar.xz"> - - - - + + + + ]> From f5f8a5d0be6896f779b143cf692ec99207190d23 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 5 Sep 2023 15:50:53 +0800 Subject: [PATCH 16/16] samba: Fix more hard coded paths to pyvenv There is now another file "samba-tool.inst" which must be fixed. --- networking/netprogs/samba.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml index dd4f476b1b..af037e500e 100644 --- a/networking/netprogs/samba.xml +++ b/networking/netprogs/samba.xml @@ -243,11 +243,11 @@ make - Fix a hard coded path to Python 3 interpreter: + Fix hard coded paths to Python 3 interpreter: sed '1s@^.*$@#!/usr/bin/python3@' \ - -i ./bin/default/source4/scripting/bin/samba-gpupdate.inst + -i ./bin/default/source4/scripting/bin/*.inst If upgrading from an old version of samba, as the