From e2fab3df42864856bfcd9e03897fafb5d66ca0ab Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 1 Jun 2022 22:22:30 +0100 Subject: [PATCH 01/32] Bump to development --- utils/etc/lsb-release | 4 ++-- utils/etc/os-release | 10 +++++----- utils/massos-release | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/etc/lsb-release b/utils/etc/lsb-release index 2c805d8..71bd83d 100644 --- a/utils/etc/lsb-release +++ b/utils/etc/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID="MassOS" -DISTRIB_RELEASE="2022.06" -DISTRIB_CODENAME="2022.06" +DISTRIB_RELEASE="development" +DISTRIB_CODENAME="development" DISTRIB_DESCRIPTION="MassOS" diff --git a/utils/etc/os-release b/utils/etc/os-release index 8ccdb03..6f41d4a 100644 --- a/utils/etc/os-release +++ b/utils/etc/os-release @@ -1,10 +1,10 @@ NAME="MassOS" -VERSION="2022.06" -VERSION_ID="2022.06" +VERSION="development" +VERSION_ID="development" ID="massos" -PRETTY_NAME="MassOS 2022.06" -BUILD_ID="2022.06" -VERSION_CODENAME="2022.06" +PRETTY_NAME="MassOS development" +BUILD_ID="development" +VERSION_CODENAME="development" LOGO="massos-logo" HOME_URL="https://massos.org" DOCUMENTATION_URL="https://github.com/MassOS-Linux/MassOS/wiki" diff --git a/utils/massos-release b/utils/massos-release index 8d0f7a5..23e3185 100644 --- a/utils/massos-release +++ b/utils/massos-release @@ -1 +1 @@ -2022.06 +development From c9f250c0d0a097764791e4a62ca688611c14c94b Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Thu, 2 Jun 2022 12:20:02 +0100 Subject: [PATCH 02/32] Don't build tests for some packages --- build-system.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build-system.sh b/build-system.sh index 6db8389..1eddcad 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3152,7 +3152,7 @@ rm -rf graphite2-1.3.14 tar -xf harfbuzz-4.3.0.tar.xz cd harfbuzz-4.3.0 mkdir hb-build; cd hb-build -meson --prefix=/usr --buildtype=release -Dgraphite2=enabled .. +meson --prefix=/usr --buildtype=release -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/harfbuzz -Dm644 ../COPYING @@ -3389,7 +3389,7 @@ rm -rf mtdev-1.1.6 tar -xf wayland-1.20.0.tar.xz cd wayland-1.20.0 mkdir wayland-build; cd wayland-build -meson --prefix=/usr --buildtype=release -Ddocumentation=false .. +meson --prefix=/usr --buildtype=release -Ddocumentation=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/wayland -Dm644 ../COPYING @@ -3399,7 +3399,7 @@ rm -rf wayland-1.20.0 tar -xf wayland-protocols-1.25.tar.xz cd wayland-protocols-1.25 mkdir wayland-protocols-build; cd wayland-protocols-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=release -Dtests=false .. ninja ninja install install -t /usr/share/licenses/wayland-protocols -Dm644 ../COPYING @@ -4561,7 +4561,7 @@ rm -rf cairomm-1.14.0 tar -xf harfbuzz-4.3.0.tar.xz cd harfbuzz-4.3.0 mkdir hb-build; cd hb-build -meson --prefix=/usr --buildtype=release -Dgraphite2=enabled .. +meson --prefix=/usr --buildtype=release -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install cd ../.. @@ -5813,7 +5813,7 @@ rm -rf glib-networking-2.72.0 tar -xf libsoup-2.74.2.tar.xz cd libsoup-2.74.2 mkdir soup-build; cd soup-build -meson --prefix=/usr --buildtype=release -Dvapi=enabled .. +meson --prefix=/usr --buildtype=release -Dtests=false -Dvapi=enabled .. ninja ninja install install -t /usr/share/licenses/libsoup -Dm644 ../COPYING @@ -5823,12 +5823,12 @@ rm -rf libsoup-2.74.2 tar -xf libsoup-3.0.6.tar.xz cd libsoup-3.0.6 mkdir soup3-build; cd soup3-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=release -Dpkcs11_tests=disabled -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING cd ../.. -rm -rf libsoup3-3.0.6 +rm -rf libsoup-3.0.6 # libostree. tar -xf libostree-2022.3.tar.xz cd libostree-2022.3 @@ -5873,7 +5873,7 @@ rm -rf appstream-glib-appstream_glib_0_7_18 tar -xf bubblewrap-0.6.2.tar.xz cd bubblewrap-0.6.2 mkdir bwrap-build; cd bwrap-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=release -Dtests=false .. ninja ninja install install -t /usr/share/licenses/bubblewrap -Dm644 ../COPYING @@ -5883,7 +5883,7 @@ rm -rf bubblewrap-0.6.2 tar -xf xdg-dbus-proxy-0.1.4.tar.xz cd xdg-dbus-proxy-0.1.4 mkdir xdp-build; cd xdp-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=release -Dtests=false .. ninja ninja install install -t /usr/share/licenses/xdg-dbus-proxy -Dm644 ../COPYING @@ -5916,7 +5916,7 @@ rm -rf flatpak-1.13.2 tar -xf libportal-0.6.tar.xz cd libportal-0.6 mkdir portal-build; cd portal-build -meson --prefix=/usr --buildtype=release -Dbackends=gtk3 -Ddocs=false .. +meson --prefix=/usr --buildtype=release -Dbackends=gtk3 -Ddocs=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libportal -Dm644 ../COPYING From cb9473c65c49f9cf42e9a05a8cfb756ffd57fe4c Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Thu, 2 Jun 2022 12:22:17 +0100 Subject: [PATCH 03/32] Build xdg-desktop-portal with PipeWire support --- build-system.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build-system.sh b/build-system.sh index 1eddcad..a63813c 100755 --- a/build-system.sh +++ b/build-system.sh @@ -5933,24 +5933,6 @@ ninja install install -t /usr/share/licenses/geoclue -Dm644 ../COPYING ../COPYING.LIB cd ../.. rm -rf geoclue-2.6.0 -# xdg-desktop-portal. -tar -xf xdg-desktop-portal-1.14.4.tar.xz -cd xdg-desktop-portal-1.14.4 -./configure --prefix=/usr --disable-pipewire -make -make install -install -t /usr/share/licenses/xdg-desktop-portal -Dm644 COPYING -cd .. -rm -rf xdg-desktop-portal-1.14.4 -# xdg-desktop-portal-gtk. -tar -xf xdg-desktop-portal-gtk-1.14.0.tar.xz -cd xdg-desktop-portal-gtk-1.14.0 -./configure --prefix=/usr -make -make install -install -t /usr/share/licenses/xdg-desktop-portal-gtk -Dm644 COPYING -cd .. -rm -rf xdg-desktop-portal-gtk-1.14.0 # libcdio. tar -xf libcdio-2.1.0.tar.bz2 cd libcdio-2.1.0 @@ -6352,6 +6334,24 @@ install -t /usr/share/licenses/pipewire -Dm644 ../COPYING install -t /usr/share/licenses/wireplumber -Dm644 ../subprojects/wireplumber/LICENSE cd ../.. rm -rf pipewire-0.3.51 +# xdg-desktop-portal. +tar -xf xdg-desktop-portal-1.14.4.tar.xz +cd xdg-desktop-portal-1.14.4 +./configure --prefix=/usr +make +make install +install -t /usr/share/licenses/xdg-desktop-portal -Dm644 COPYING +cd .. +rm -rf xdg-desktop-portal-1.14.4 +# xdg-desktop-portal-gtk. +tar -xf xdg-desktop-portal-gtk-1.14.0.tar.xz +cd xdg-desktop-portal-gtk-1.14.0 +./configure --prefix=/usr +make +make install +install -t /usr/share/licenses/xdg-desktop-portal-gtk -Dm644 COPYING +cd .. +rm -rf xdg-desktop-portal-gtk-1.14.0 # WebKitGTK. tar -xf webkitgtk-2.36.3.tar.xz cd webkitgtk-2.36.3 From 3bfc2f9a658d192ab0cc2642b0608dcd82e75e99 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Fri, 3 Jun 2022 12:12:09 +0100 Subject: [PATCH 04/32] Update issue template --- .github/ISSUE_TEMPLATE/bug_report.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index baa881e..cd0da04 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -16,14 +16,14 @@ body: attributes: label: "MassOS version" description: "What version of MassOS are you using? Run `massos-release` in a terminal if unsure." - placeholder: "2022.03" + placeholder: "2022.06" validations: required: true - type: "input" attributes: label: "Kernel version" description: "What is the output of `uname -srvm`?" - placeholder: "Linux 5.16.12-massos #1 SMP PREEMPT Thu Mar 3 05:15:15 UTC 2022 x86_64" + placeholder: "Linux 5.18.1-massos #1 SMP PREEMPT_DYNAMIC Wed Jun 1 16:11:46 UTC 2022 x86_64" validations: required: false - type: "checkboxes" @@ -54,10 +54,7 @@ body: attributes: label: "Steps to reproduce" description: "A clear description of how to reproduce the problem." - placeholder: "1. Open `...` - 2. Select `...` - 3. Click on `...` - 4. See error" + placeholder: "Open `...`, click on `...`, select `...`, see error." validations: required: false - type: "textarea" From 226d0287a43a7d8a019ceb3106681e389f492750 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 4 Jun 2022 13:43:54 +0100 Subject: [PATCH 05/32] Package updates --- build-system.sh | 66 ++++++++++++++++++++++++------------------------- changelog.md | 17 +++++++++++++ source-urls | 18 +++++++------- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/build-system.sh b/build-system.sh index a63813c..7231446 100755 --- a/build-system.sh +++ b/build-system.sh @@ -897,8 +897,8 @@ install -t /usr/share/licenses/ninja -Dm644 COPYING cd .. rm -rf ninja-1.11.0 # Meson. -tar -xf meson-0.62.1.tar.gz -cd meson-0.62.1 +tar -xf meson-0.62.2.tar.gz +cd meson-0.62.2 python setup.py build python setup.py install --root=meson-destination-directory cp -r meson-destination-directory/* / @@ -906,7 +906,7 @@ install -Dm644 data/shell-completions/bash/meson /usr/share/bash-completion/comp install -Dm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson install -t /usr/share/licenses/meson -Dm644 COPYING cd .. -rm -rf meson-0.62.1 +rm -rf meson-0.62.2 # PyParsing. tar -xf pyparsing_3.0.7.tar.gz cd pyparsing-pyparsing_3.0.7 @@ -1105,8 +1105,8 @@ install -t /usr/share/licenses/iproute2 -Dm644 COPYING cd .. rm -rf iproute2-5.18.0 # Kbd. -tar -xf kbd-2.4.0.tar.xz -cd kbd-2.4.0 +tar -xf kbd-2.5.0.tar.xz +cd kbd-2.5.0 patch -Np1 -i ../patches/kbd-2.4.0-backspace-1.patch sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in @@ -1115,7 +1115,7 @@ make make install install -t /usr/share/licenses/kbd -Dm644 COPYING cd .. -rm -rf kbd-2.4.0 +rm -rf kbd-2.5.0 # libpipeline. tar -xf libpipeline-1.5.6.tar.gz cd libpipeline-1.5.6 @@ -1824,18 +1824,18 @@ install -t /usr/share/licenses/gnu-efi -Dm644 README.efilib cd .. rm -rf gnu-efi-3.0.14 # hwdata. -tar -xf hwdata-0.359.tar.gz -cd hwdata-0.359 +tar -xf hwdata-0.360.tar.gz +cd hwdata-0.360 install -t /usr/share/hwdata -Dm644 pci.ids pnp.ids usb.ids install -t /usr/share/licenses/hwdata -Dm644 COPYING LICENSE cd .. -rm -rf hwdata-0.359 +rm -rf hwdata-0.360 # Systemd (initial build; will be rebuilt later to support more features). -tar -xf systemd-stable-251.1.tar.gz -cd systemd-stable-251.1 +tar -xf systemd-stable-251.2.tar.gz +cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.1-massos -Dshared-lib-tag=251.1-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=false -Duserdb=false -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=false -Duserdb=false -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. ninja ninja install systemd-machine-id-setup @@ -1860,7 +1860,7 @@ END install -t /usr/share/licenses/systemd -Dm644 ../LICENSE.GPL2 ../LICENSE.LGPL2.1 ../LICENSES/* cd ../.. cp systemd-units/* /usr/lib/systemd/system -rm -rf systemd-stable-251.1 +rm -rf systemd-stable-251.2 # D-Bus (initial build; will be rebuilt later for X and libaudit support). tar -xf dbus-1.14.0.tar.xz cd dbus-1.14.0 @@ -2250,7 +2250,7 @@ rm -rf RHash-1.4.2 tar -xf cmake-3.23.2.tar.gz cd cmake-3.23.2 sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake -./bootstrap --prefix=/usr --parallel=$(nproc) --generator=Ninja --mandir=/share/man --docdir=/share/doc/cmake --system-libs +./bootstrap --prefix=/usr --parallel=$(nproc) --generator=Ninja --docdir=/share/doc/cmake --mandir=/share/man --system-libs --sphinx-man ninja ninja install install -t /usr/share/licenses/cmake -Dm644 Copyright.txt @@ -3558,14 +3558,14 @@ install -t /usr/share/licenses/sassc -Dm644 LICENSE cd .. rm -rf sassc-3.6.2 # ISO-Codes. -tar -xf iso-codes_4.9.0.orig.tar.xz -cd iso-codes-4.9.0 +tar -xf iso-codes_4.10.0.orig.tar.xz +cd iso-codes-4.10.0 ./configure --prefix=/usr make make install install -t /usr/share/licenses/iso-codes -Dm644 COPYING cd .. -rm -rf iso-codes-4.9.0 +rm -rf iso-codes-4.10.0 # xdg-user-dirs. tar -xf xdg-user-dirs-0.17.tar.gz cd xdg-user-dirs-0.17 @@ -3936,15 +3936,15 @@ install -t /usr/share/licenses/libglvnd -Dm644 ../COPYING cd ../.. rm -rf libglvnd-v1.4.0 # Mesa. -tar -xf mesa-22.1.0.tar.xz -cd mesa-22.1.0 +tar -xf mesa-22.1.1.tar.xz +cd mesa-22.1.1 mkdir mesa-build; cd mesa-build meson --prefix=/usr --buildtype=release -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled .. ninja ninja install install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst cd ../.. -rm -rf mesa-22.1.0 +rm -rf mesa-22.1.1 # libva (rebuild to support Mesa). tar -xf libva-2.14.0.tar.bz2 cd libva-2.14.0 @@ -4021,11 +4021,11 @@ install -t /usr/share/licenses/libxkbcommon -Dm644 ../LICENSE cd ../.. rm -rf libxkbcommon-1.4.1 # Systemd (rebuild to support more features). -tar -xf systemd-stable-251.1.tar.gz -cd systemd-stable-251.1 +tar -xf systemd-stable-251.2.tar.gz +cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.1-massos -Dshared-lib-tag=251.1-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=true -Duserdb=true -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=true -Duserdb=true -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. ninja ninja install cat > /etc/pam.d/systemd-user << END @@ -4041,7 +4041,7 @@ auth required pam_deny.so password required pam_deny.so END cd ../.. -rm -rf systemd-stable-251.1 +rm -rf systemd-stable-251.2 # D-Bus (rebuild for X and libaudit support). tar -xf dbus-1.14.0.tar.xz cd dbus-1.14.0 @@ -4325,8 +4325,8 @@ ln -sf tealdeer /usr/share/licenses/tldr cd .. rm -rf tealdeer-1.5.0 # htop. -tar -xf htop-3.1.2.tar.xz -cd htop-3.1.2 +tar -xf htop-3.2.1.tar.xz +cd htop-3.2.1 ./configure --prefix=/usr --sysconfdir=/etc --enable-delayacct --enable-openvz --enable-unicode --enable-vserver make make install @@ -4337,7 +4337,7 @@ ln -sf htop.1 /usr/share/man/man1/top.1 rm -f /usr/share/applications/htop.desktop install -t /usr/share/licenses/htop -Dm644 COPYING cd .. -rm -rf htop-3.1.2 +rm -rf htop-3.2.1 # bsd-games. tar -xf bsd-games-3.1.tar.gz cd bsd-games-3.1 @@ -4654,8 +4654,8 @@ install -t /usr/share/licenses/libglade -Dm644 COPYING cd .. rm -rf libglade-2.6.4 # Graphviz. -tar -xf graphviz-3.0.0.tar.gz -cd graphviz-3.0.0 +tar -xf graphviz-4.0.0.tar.bz2 +cd graphviz-4.0.0 sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac ./autogen.sh ./configure --prefix=/usr --disable-php --enable-lefty --with-webp @@ -4663,7 +4663,7 @@ make make install install -t /usr/share/licenses/graphviz -Dm644 COPYING cd .. -rm -rf graphviz-3.0.0 +rm -rf graphviz-4.0.0 # Vala. tar -xf vala-0.56.1.tar.xz cd vala-0.56.1 @@ -5311,8 +5311,8 @@ install -t /usr/share/licenses/polkit-gnome -Dm644 COPYING cd .. rm -rf polkit-gnome-0.105 # Poppler. -tar -xf poppler-22.05.0.tar.xz -cd poppler-22.05.0 +tar -xf poppler-22.06.0.tar.xz +cd poppler-22.06.0 mkdir poppler-build; cd poppler-build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTESTDATADIR=$PWD/testfiles -DENABLE_UNSTABLE_API_ABI_HEADERS=ON -Wno-dev -G Ninja .. ninja @@ -5322,7 +5322,7 @@ tar -xf ../../poppler-data-0.4.11.tar.gz cd poppler-data-0.4.11 make prefix=/usr install cd ../../.. -rm -rf poppler-22.05.0 +rm -rf poppler-22.06.0 # Ghostscript. tar -xf ghostscript-9.56.1.tar.xz cd ghostscript-9.56.1 diff --git a/changelog.md b/changelog.md index 7ed6bf7..2a56513 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,23 @@ # Full Changelog History This document contains the full changelog for every previous versions of MassOS, as well as the changes currently in development for the next upcoming version of MassOS (which may be subject to change before the version is finally released). +# Current Development +Changes: + +- Development has only just begun, check back soon. + +Upgraded software: + +- Graphviz: `3.0.0 --> 4.0.0` +- htop: `3.1.2 --> 3.2.1` +- hwdata: `0.359 --> 0.360` +- ISO-Codes: `4.9.0 --> 4.10.0` +- kbd: `2.4.0 --> 2.5.0` +- Mesa: `22.1.0 --> 22.1.1` +- Meson: `0.62.1 --> 0.62.2` +- Poppler: `22.05.0 --> 22.06.0` +- systemd: `251.1 --> 251.2` + # MassOS 2022.06 Changes: diff --git a/source-urls b/source-urls index 360ae0f..5e683cc 100644 --- a/source-urls +++ b/source-urls @@ -162,7 +162,7 @@ https://archive.massos.org/precompiled/gpm-1.20.7-38-ge82d1a6-x86_64-Precompiled https://archive.massos.org/sources/gptfdisk-1.0.9.tar.gz https://github.com/ebassi/graphene/archive/1.10.8/graphene-1.10.8.tar.gz https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.tgz -https://gitlab.com/graphviz/graphviz/-/archive/3.0.0/graphviz-3.0.0.tar.gz +https://gitlab.com/graphviz/graphviz/-/archive/4.0.0/graphviz-4.0.0.tar.bz2 https://mirror.lyrahosting.com/gnu/grep/grep-3.7.tar.xz https://mirror.lyrahosting.com/gnu/groff/groff-1.22.4.tar.gz https://mirror.lyrahosting.com/gnu/grub/grub-2.06.tar.xz @@ -188,9 +188,9 @@ https://mirror.lyrahosting.com/gnu/gzip/gzip-1.12.tar.xz https://github.com/harfbuzz/harfbuzz/releases/download/4.3.0/harfbuzz-4.3.0.tar.xz https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.tar.xz https://mirror.lyrahosting.com/gentoo/distfiles/hplip-3.22.2.tar.gz -https://github.com/htop-dev/htop/releases/download/3.1.2/htop-3.1.2.tar.xz +https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz https://mirror.lyrahosting.com/gnu/help2man/help2man-1.49.2.tar.xz -https://github.com/vcrhonek/hwdata/archive/v0.359/hwdata-0.359.tar.gz +https://github.com/vcrhonek/hwdata/archive/v0.360/hwdata-0.360.tar.gz https://github.com/Mic92/iana-etc/releases/download/20220524/iana-etc-20220524.tar.gz https://www.x.org/archive/individual/app/iceauth-1.0.9.tar.xz https://mirror.lyrahosting.com/ubuntuarchive/ubuntu/pool/main/i/icon-naming-utils/icon-naming-utils_0.8.90.orig.tar.gz @@ -202,7 +202,7 @@ https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi- https://archive.massos.org/sources/intltool-0.51.0.tar.gz https://cdn.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.18.0.tar.xz https://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2 -https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.9.0.orig.tar.xz +https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.10.0.orig.tar.xz https://archive.massos.org/sources/itstool-2.0.7.tar.bz2 https://github.com/jackaudio/jack2/archive/v1.9.21/jack2-1.9.21.tar.gz https://digip.org/jansson/releases/jansson-2.13.1.tar.gz @@ -212,7 +212,7 @@ https://www.cpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.06.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz https://github.com/open-source-parsers/jsoncpp/archive/1.9.5/jsoncpp-1.9.5.tar.gz -https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz +https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.5.0.tar.xz https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://kerberos.org/dist/krb5/1.20/krb5-1.20.tar.gz @@ -403,8 +403,8 @@ https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.3.6.tar.gz https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-2.1.1.tar.gz https://github.com/MassOS-Linux/massos-welcome/archive/cc649f83e04f0daa880edf1df8e4d5165b79787c/massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c.tar.gz https://cdn.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz -https://archive.mesa3d.org/mesa-22.1.0.tar.xz -https://github.com/mesonbuild/meson/releases/download/0.62.1/meson-0.62.1.tar.gz +https://archive.mesa3d.org/mesa-22.1.1.tar.xz +https://github.com/mesonbuild/meson/releases/download/0.62.2/meson-0.62.2.tar.gz https://www.x.org/archive/individual/app/mkfontscale-1.2.2.tar.xz https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/20220511/mobile-broadband-provider-info-20220511.tar.bz2 https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.8.tar.xz @@ -477,7 +477,7 @@ https://files.pythonhosted.org/packages/source/p/ply/ply-3.11.tar.gz https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz https://www.freedesktop.org/software/polkit/releases/polkit-0.120.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz -https://poppler.freedesktop.org/poppler-22.05.0.tar.xz +https://poppler.freedesktop.org/poppler-22.06.0.tar.xz https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz https://archive.massos.org/sources/popsicle-1.3.0-54-ga1561b3.tar.xz https://github.com/rpm-software-management/popt/archive/refs/tags/popt-1.18-release.tar.gz @@ -545,7 +545,7 @@ https://www.freedesktop.org/software/startup-notification/releases/startup-notif https://www.sudo.ws/sudo/dist/sudo-1.9.10.tar.gz https://archive.massos.org/sources/swig-4.0.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz -https://github.com/systemd/systemd-stable/archive/v251.1/systemd-stable-251.1.tar.gz +https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz https://taglib.github.io/releases/taglib-1.12.tar.gz https://mirror.lyrahosting.com/gnu/tar/tar-1.34.tar.xz https://archive.massos.org/sources/tcl8.6.12-src.tar.gz From 1941fe69e330f95cf890b58c837f2ecffc1d5f4c Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 4 Jun 2022 13:46:18 +0100 Subject: [PATCH 06/32] Remove unneeded symlink --- build-system.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-system.sh b/build-system.sh index 7231446..87f838d 100755 --- a/build-system.sh +++ b/build-system.sh @@ -7126,6 +7126,8 @@ rm -f /linuxrc rm -f /usr/bin/lsof # Unused package managers, potentially dangerous on MassOS. rm -f /usr/bin/{dpkg,dpkg-deb,rpm} +# Unneeded. +if [ "$(readlink /usr/sbin/httpd)" = "/usr/bin/busybox" ]; then rm -f /usr/sbin/httpd; fi # Remove Debian stuff. rm -rf /etc/kernel # Move any misplaced files. @@ -7174,6 +7176,8 @@ fi # Workaround no longer needed since Firefox 99+ supports FFmpeg 5.0. test ! -e /etc/ld.so.conf.d/firefox-libav.conf || rm -f /etc/ld.so.conf.d/firefox-libav.conf test ! -d /usr/lib/firefox/libav || rm -rf /usr/lib/firefox/libav +# Unneeded. +if [ "$(readlink /usr/sbin/httpd)" = "/usr/bin/busybox" ]; then rm -f /usr/sbin/httpd; fi # Now using BGRT theme instead of spinner. ! grep -q "Theme=spinner" /etc/plymouth/plymouthd.conf || plymouth-set-default-theme bgrt # Now using PipeWire instead of PulseAudio. From d3f8d4bae0c9b11c4c41accd53cce6cf689022d1 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 4 Jun 2022 16:09:54 +0100 Subject: [PATCH 07/32] Slightly alter PipeWire configuration Pass subproject options directly to Meson rather than manually editing meson_options.txt. --- build-system.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-system.sh b/build-system.sh index 87f838d..356c31c 100755 --- a/build-system.sh +++ b/build-system.sh @@ -6322,9 +6322,8 @@ tar -xf pipewire-0.3.51.tar.gz cd pipewire-0.3.51 tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects mv subprojects/wireplumber{-0.4.10,} -sed -i '5 s/false/true/' subprojects/wireplumber/meson_options.txt mkdir pipewire-build; cd pipewire-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber .. +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber -Dwireplumber:system-lua=true -Dwireplumber:tests=false .. ninja ninja install systemctl --global enable pipewire.socket pipewire-pulse.socket From 066e4a0b70a29a1daf1a9ff2009e00c6e782fcb7 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sun, 5 Jun 2022 01:10:33 +0100 Subject: [PATCH 08/32] Add Vulkan-Tools --- build-system.sh | 10 ++++++++++ changelog.md | 2 +- source-urls | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build-system.sh b/build-system.sh index 356c31c..5861def 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3905,6 +3905,16 @@ ninja install install -t /usr/share/licenses/vulkan-loader -Dm644 ../LICENSE.txt cd ../.. rm -rf Vulkan-Loader-1.3.213 +# Vulkan-Tools. +tar -xf Vulkan-Tools-1.3.213.tar.gz +cd Vulkan-Tools-1.3.213 +mkdir VT-build; cd VT-build +cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DGLSLANG_INSTALL_DIR=/usr -DCMAKE_SKIP_RPATH=TRUE -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DBUILD_CUBE=ON -DBUILD_ICD=OFF -DBUILD_VULKANINFO=ON -Wno-dev -G Ninja .. +ninja +ninja install +install -t /usr/share/licenses/vulkan-tools -Dm644 ../LICENSE.txt +cd ../.. +rm -rf Vulkan-Tools-1.3.213 # libva (circular dependency; will be rebuilt later to support Mesa). tar -xf libva-2.14.0.tar.bz2 cd libva-2.14.0 diff --git a/changelog.md b/changelog.md index 2a56513..dc61aaa 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ This document contains the full changelog for every previous versions of MassOS, # Current Development Changes: -- Development has only just begun, check back soon. +- Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. Upgraded software: diff --git a/source-urls b/source-urls index 5e683cc..00a20a4 100644 --- a/source-urls +++ b/source-urls @@ -582,6 +582,7 @@ https://github.com/felixonmars/volume_key/archive/volume_key-0.3.12.tar.gz https://gitlab.gnome.org/GNOME/vte/-/archive/0.68.0/vte-0.68.0.tar.bz2 https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.213/Vulkan-Headers-1.3.213.tar.gz https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.3.213/Vulkan-Loader-1.3.213.tar.gz +https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.3.213/Vulkan-Tools-1.3.213.tar.gz https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz https://webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz From 7fd3a7dec42e57975bdfb1f4cedf2bd6883bb545 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 11 Jun 2022 14:22:16 +0100 Subject: [PATCH 09/32] Package updates and fixes. --- build-system.sh | 220 +++++++++++++++--------------- changelog.md | 24 ++++ source-urls | 105 +++++++------- stage1.sh | 12 +- utils/build-configs/kernel-config | 6 +- 5 files changed, 199 insertions(+), 168 deletions(-) diff --git a/build-system.sh b/build-system.sh index 5861def..a657fbc 100755 --- a/build-system.sh +++ b/build-system.sh @@ -88,13 +88,13 @@ make install cd .. rm -rf perl-5.36.0 # Python. -tar -xf Python-3.10.4.tar.xz -cd Python-3.10.4 +tar -xf Python-3.10.5.tar.xz +cd Python-3.10.5 ./configure --prefix=/usr --enable-shared --without-ensurepip make make install cd .. -rm -rf Python-3.10.4 +rm -rf Python-3.10.5 # Texinfo. tar -xf texinfo-6.8.tar.xz cd texinfo-6.8 @@ -415,11 +415,10 @@ create-cracklib-dict /usr/share/dict/cracklib-words /usr/share/dict/cracklib-ext install -t /usr/share/licenses/cracklib -Dm644 COPYING.LIB cd .. rm -rf cracklib-2.9.7 -# Linux-PAM. +# Linux-PAM (initial build, will be rebuilt later to support Audit). tar -xf Linux-PAM-1.5.2.tar.xz cd Linux-PAM-1.5.2 -tar -xf ../Linux-PAM-1.5.2-docs.tar.xz --strip-components=1 -./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-securedir=/usr/lib/security +./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-securedir=/usr/lib/security --disable-doc --disable-pie make make install chmod 4755 /usr/sbin/unix_chkpwd @@ -870,8 +869,8 @@ install -t /usr/share/licenses/kmod -Dm644 COPYING cd .. rm -rf kmod-29 # Python (initial build; will be rebuilt later to support SQLite and Tk). -tar -xf Python-3.10.4.tar.xz -cd Python-3.10.4 +tar -xf Python-3.10.5.tar.xz +cd Python-3.10.5 ./configure --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-system-libmpdec --with-ensurepip=yes --enable-optimizations make make install @@ -882,7 +881,7 @@ ln -sf python3-config /usr/bin/python-config ln -sf pip3 /usr/bin/pip install -t /usr/share/licenses/python -Dm644 LICENSE cd .. -rm -rf Python-3.10.4 +rm -rf Python-3.10.5 # Sphinx (required to build man pages of some packages). tar -xf sphinx-4.5.0-x86_64-venv.tar.xz mv sphinx{-4.5.0-x86_64-venv,} @@ -947,14 +946,14 @@ install -t /usr/share/licenses/libseccomp -Dm644 LICENSE cd .. rm -rf libseccomp-2.5.4 # File. -tar -xf file-5.41.tar.gz -cd file-5.41 +tar -xf file-5.42.tar.gz +cd file-5.42 ./configure --prefix=/usr --enable-libseccomp make make install install -t /usr/share/licenses/file -Dm644 COPYING cd .. -rm -rf file-5.41 +rm -rf file-5.42 # Coreutils. tar -xf coreutils-9.1.tar.xz cd coreutils-9.1 @@ -1108,6 +1107,7 @@ rm -rf iproute2-5.18.0 tar -xf kbd-2.5.0.tar.xz cd kbd-2.5.0 patch -Np1 -i ../patches/kbd-2.4.0-backspace-1.patch +sed -i 's/euro2/euro2.map/' data/keymaps/i386/qwerty/pt-latin1.map sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in ./configure --prefix=/usr @@ -1788,13 +1788,12 @@ xmlcatalog --noout --add "delegateURI" "http://docbook.org/xml/5.1/xsd/" "file:/ cd .. rm -rf docbook-5.1 # lxml. -tar -xf lxml-4.8.0.tar.gz -cd lxml-4.8.0 -python setup.py build +tar -xf lxml-4.9.0.tar.gz +cd lxml-4.9.0 python setup.py install --optimize=1 install -t /usr/share/licenses/lxml -Dm644 LICENSE.txt LICENSES.txt cd .. -rm -rf lxml-4.8.0 +rm -rf lxml-4.9.0 # itstool. tar -xf itstool-2.0.7.tar.bz2 cd itstool-2.0.7 @@ -1835,7 +1834,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=false -Duserdb=false -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dfirstboot=false -Dhomed=false -Dinstall-tests=false -Dldconfig=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=false .. ninja ninja install systemd-machine-id-setup @@ -2051,14 +2050,14 @@ install -t /usr/share/licenses/lvm2 -Dm644 COPYING{,.BSD,.LIB} cd .. rm -rf LVM2.2.03.16 # btrfs-progs. -tar -xf btrfs-progs-v5.18.tar.xz -cd btrfs-progs-v5.18 +tar -xf btrfs-progs-v5.18.1.tar.xz +cd btrfs-progs-v5.18.1 ./configure --prefix=/usr make make install install -t /usr/share/licenses/btrfs-progs -Dm644 COPYING cd .. -rm -rf btrfs-progs-v5.18 +rm -rf btrfs-progs-v5.18.1 # inih. tar -xf inih-r55.tar.gz cd inih-r55 @@ -2079,16 +2078,16 @@ install -t /usr/share/licenses/userspace-rcu -Dm644 LICENSE gpl-2.0.txt lgpl-2.1 cd .. rm -rf userspace-rcu-0.13.1 # xfsprogs. -tar -xf xfsprogs-5.16.0.tar.xz -cd xfsprogs-5.16.0 +tar -xf xfsprogs-5.18.0.tar.xz +cd xfsprogs-5.18.0 make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root make install make install-dev cd .. -rm -rf xfsprogs-5.16.0 +rm -rf xfsprogs-5.18.0 # ntfs-3g. -tar -xf ntfs-3g-2021.8.22.tar.gz -cd ntfs-3g-2021.8.22 +tar -xf ntfs-3g-2022.5.17.tar.gz +cd ntfs-3g-2022.5.17 ./autogen.sh ./configure --prefix=/usr --disable-static --with-fuse=external make @@ -2097,7 +2096,7 @@ ln -s ../bin/ntfs-3g /usr/sbin/mount.ntfs ln -s ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8 install -t /usr/share/licenses/ntfs-3g -Dm644 COPYING COPYING.LIB cd .. -rm -rf ntfs-3g-2021.8.22 +rm -rf ntfs-3g-2022.5.17 # exfatprogs. tar -xf exfatprogs_1.1.3.orig.tar.xz cd exfatprogs-1.1.3 @@ -2506,15 +2505,15 @@ install -t /usr/share/licenses/libassuan -Dm644 COPYING COPYING.LIB cd .. rm -rf libassuan-2.5.5 # Nettle. -tar -xf nettle-3.7.3.tar.gz -cd nettle-3.7.3 +tar -xf nettle-3.8.tar.gz +cd nettle-3.8 ./configure --prefix=/usr --disable-static make make install chmod 755 /usr/lib/lib{hogweed,nettle}.so install -t /usr/share/licenses/nettle -Dm644 COPYINGv2 COPYINGv3 COPYING.LESSERv3 cd .. -rm -rf nettle-3.7.3 +rm -rf nettle-3.8 # GNUTLS. tar -xf gnutls-3.7.6.tar.xz cd gnutls-3.7.6 @@ -2733,8 +2732,7 @@ rm -rf apparmor-3.0.4 # Linux-PAM (rebuild to support Audit). tar -xf Linux-PAM-1.5.2.tar.xz cd Linux-PAM-1.5.2 -tar -xf ../Linux-PAM-1.5.2-docs.tar.xz --strip-components=1 -./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-securedir=/usr/lib/security +./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib --enable-securedir=/usr/lib/security --disable-pie make make install chmod 4755 /usr/sbin/unix_chkpwd @@ -3047,19 +3045,19 @@ install -t /usr/share/licenses/js91 -Dm644 ../../extra-package-licenses/js91-lic cd ../.. rm -rf firefox-91.10.0 # Sudo. -tar -xf sudo-1.9.10.tar.gz -cd sudo-1.9.10 +tar -xf sudo-1.9.11p1.tar.gz +cd sudo-1.9.11p1 ./configure --prefix=/usr --libexecdir=/usr/lib --disable-pie --with-linux-audit --with-secure-path --with-insults --with-all-insults --with-passwd-tries=5 --with-env-editor --with-passprompt="[sudo] password for %p: " make make install ln -sf libsudo_util.so.0.0.0 /usr/lib/sudo/libsudo_util.so.0 -cat > /etc/sudoers.d/default << END +cat > /etc/sudoers.d/default << "END" # Show astericks when typing the password. Defaults pwfeedback # Allow members of the 'wheel' group to execute 'sudo'. %wheel ALL=(ALL) ALL END -cat > /etc/pam.d/sudo << END +cat > /etc/pam.d/sudo << "END" auth include system-auth account include system-account session required pam_env.so @@ -3067,7 +3065,7 @@ session include system-session END install -t /usr/share/licenses/sudo -Dm644 LICENSE.md cd .. -rm -rf sudo-1.9.10 +rm -rf sudo-1.9.11p1 # volume-key. tar -xf volume_key-0.3.12.tar.gz cd volume_key-volume_key-0.3.12 @@ -3321,14 +3319,14 @@ install -t /usr/share/licenses/libbytesize -Dm644 LICENSE cd .. rm -rf libbytesize-2.7 # libblockdev. -tar -xf libblockdev-2.26.tar.gz -cd libblockdev-2.26 -./configure --prefix=/usr --sysconfdir=/etc --with-python3 --without-nvdimm --without-dm +tar -xf libblockdev-2.27.tar.gz +cd libblockdev-2.27 +./configure --prefix=/usr --sysconfdir=/etc --with-python3 make make install install -t /usr/share/licenses/libblockdev -Dm644 LICENSE cd .. -rm -rf libblockdev-2.26 +rm -rf libblockdev-2.27 # libdaemon. tar -xf libdaemon_0.14.orig.tar.gz cd libdaemon-0.14 @@ -3822,9 +3820,10 @@ for i in xtrans-1.4.0 libX11-1.8 libXext-1.3.4 libFS-1.0.8 libICE-1.0.10 libSM-1 tar -xf $i.tar.* cd $i case $i in - libICE* ) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static ICE_LIBS=-lpthread ;; - libXt-[0-9]* ) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-appdefaultdir=/etc/X11/app-defaults ;; - * ) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static + libX11*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --disable-thread-safety-constructor ;; + libICE*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static ICE_LIBS=-lpthread ;; + libXt-[0-9]*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-appdefaultdir=/etc/X11/app-defaults ;; + *) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static esac make make install @@ -3846,25 +3845,25 @@ for i in xcb-util-0.4.0 xcb-util-image-0.4.0 xcb-util-keysyms-0.4.0 xcb-util-ren ldconfig done # libdrm. -tar -xf libdrm-2.4.110.tar.xz -cd libdrm-2.4.110 +tar -xf libdrm-2.4.111.tar.xz +cd libdrm-2.4.111 mkdir libdrm-build; cd libdrm-build meson --prefix=/usr --buildtype=release -Dudev=true -Dvalgrind=false .. ninja ninja install install -t /usr/share/licenses/libdrm -Dm644 ../../extra-package-licenses/libdrm-license.txt cd ../.. -rm -rf libdrm-2.4.110 +rm -rf libdrm-2.4.111 # DirectX-Headers. -tar -xf DirectX-Headers-1.600.10.tar.gz -cd DirectX-Headers-1.600.10 +tar -xf DirectX-Headers-1.602.0.tar.gz +cd DirectX-Headers-1.602.0 mkdir DXH-build; cd DXH-build meson --prefix=/usr --buildtype=release -Dbuild-test=false .. ninja ninja install install -t /usr/share/licenses/directx-headers -Dm644 ../LICENSE cd ../.. -rm -rf DirectX-Headers-1.600.10 +rm -rf DirectX-Headers-1.602.0 # glslang. tar -xf glslang-11.9.0.tar.gz cd glslang-11.9.0 @@ -4011,15 +4010,15 @@ sed -i 's|sans-serif|Noto Sans|' /etc/fonts/fo sed -i 's|monospace|Noto Sans Mono|' /etc/fonts/fonts.conf fc-cache # XKeyboard-Config. -tar -xf xkeyboard-config-2.35.1.tar.xz -cd xkeyboard-config-2.35.1 +tar -xf xkeyboard-config-2.36.tar.xz +cd xkeyboard-config-2.36 mkdir XKeyboard-Config-BUILD; cd XKeyboard-Config-BUILD meson --prefix=/usr -Dcompat-rules=true -Dxkb-base=/usr/share/X11/xkb -Dxorg-rules-symlinks=true .. ninja ninja install install -t /usr/share/licenses/xkeyboard-config -Dm644 ../COPYING cd ../.. -rm -rf xkeyboard-config-2.35.1 +rm -rf xkeyboard-config-2.36 # libxkbcommon. tar -xf libxkbcommon-1.4.1.tar.xz cd libxkbcommon-1.4.1 @@ -4035,7 +4034,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dfallback-hostname=massos -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dblkid=true -Ddefault-dnssec=no -Ddns-over-tls=openssl -Ddns-servers="1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google" -Dfirstboot=false -Dinstall-tests=false -Dldconfig=false -Dsysusers=false -Db_lto=false -Drpmmacrosdir=no -Dhomed=true -Duserdb=true -Dgnu-efi=true -Dman=true -Dpamconfdir=/etc/pam.d -Dtests=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dfirstboot=false -Dhomed=true -Dinstall-tests=false -Dldconfig=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=true .. ninja ninja install cat > /etc/pam.d/systemd-user << END @@ -4083,14 +4082,14 @@ install -t /usr/share/licenses/dbus-glib -Dm644 COPYING cd .. rm -rf dbus-glib-0.112 # alsa-lib. -tar -xf alsa-lib-1.2.6.1.tar.bz2 -cd alsa-lib-1.2.6.1 -./configure +tar -xf alsa-lib-1.2.7.tar.bz2 +cd alsa-lib-1.2.7 +./configure --prefix=/usr --without-debug make make install install -t /usr/share/licenses/alsa-lib -Dm644 COPYING cd .. -rm -rf alsa-lib-1.2.6.1 +rm -rf alsa-lib-1.2.7 # libepoxy. tar -xf libepoxy-1.5.10.tar.gz cd libepoxy-1.5.10 @@ -4415,6 +4414,17 @@ rm -f /usr/share/pixmaps/vitetris.xpm install -t /usr/share/licenses/vitetris -Dm644 licence.txt cd .. rm -rf vitetris-0.59.1 +# mtools. +tar -xf mtools-4.0.40.tar.gz +cd mtools-4.0.40 +sed -e '/^SAMPLE FILE$/s:^:# :' -i mtools.conf +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info +make +make install +install -m644 mtools.conf /etc/mtools.conf +install -t /usr/share/licenses/mtools -Dm644 COPYING +cd .. +rm -rf mtools-4.0.40 # Polkit. tar -xf polkit-0.120.tar.gz cd polkit-0.120 @@ -4506,15 +4516,15 @@ install -t /usr/share/licenses/lcms2 -Dm644 COPYING cd .. rm -rf lcms2-2.13.1 # JasPer. -tar -xf jasper-version-3.0.3.tar.gz -cd jasper-version-3.0.3 +tar -xf jasper-version-3.0.4.tar.gz +cd jasper-version-3.0.4 mkdir jasper-build; cd jasper-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_INSTALL_RPATH=YES -DJAS_ENABLE_DOC=NO -DJAS_ENABLE_LIBJPEG=ON -DJAS_ENABLE_OPENGL=ON -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/jasper -Dm644 ../LICENSE.txt cd ../.. -rm -rf jasper-version-3.0.3 +rm -rf jasper-version-3.0.4 # ATK. tar -xf atk-2.38.0.tar.xz cd atk-2.38.0 @@ -4694,15 +4704,15 @@ install -t /usr/share/licenses/libgusb -Dm644 ../COPYING cd ../.. rm -rf libgusb-0.3.10 # librsvg. -tar -xf librsvg-2.54.3.tar.xz -cd librsvg-2.54.3 +tar -xf librsvg-2.54.4.tar.xz +cd librsvg-2.54.4 ./configure --prefix=/usr --enable-vala --disable-static make make install gdk-pixbuf-query-loaders --update-cache install -t /usr/share/licenses/librsvg -Dm644 COPYING.LIB cd .. -rm -rf librsvg-2.54.3 +rm -rf librsvg-2.54.4 # adwaita-icon-theme. tar -xf adwaita-icon-theme-41.0.tar.xz cd adwaita-icon-theme-41.0 @@ -5452,13 +5462,13 @@ install -t /usr/share/licenses/tk -Dm644 license.terms cd ../.. rm -rf tk8.6.12 # Python (rebuild to support SQLite and Tk). -tar -xf Python-3.10.4.tar.xz -cd Python-3.10.4 +tar -xf Python-3.10.5.tar.xz +cd Python-3.10.5 ./configure --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-system-libmpdec --with-ensurepip=yes --enable-optimizations make make install cd .. -rm -rf Python-3.10.4 +rm -rf Python-3.10.5 # python-distutils-extra. tar -xf python-distutils-extra-2.39.tar.gz cd python-distutils-extra-2.39 @@ -5684,8 +5694,8 @@ install -t /usr/share/licenses/newt -Dm644 COPYING cd .. rm -rf newt-0.52.21 # UPower. -tar -xf upower-v0.99.18.tar.bz2 -cd upower-v0.99.18 +tar -xf upower-v0.99.19.tar.bz2 +cd upower-v0.99.19 mkdir upower-build; cd upower-build meson --prefix=/usr --buildtype=release .. ninja @@ -5693,7 +5703,7 @@ ninja install install -t /usr/share/licenses/upower -Dm644 ../COPYING systemctl enable upower cd ../.. -rm -rf upower-v0.99.18 +rm -rf upower-v0.99.19 # NetworkManager. tar -xf NetworkManager-1.38.0.tar.xz cd NetworkManager-1.38.0 @@ -5768,15 +5778,15 @@ install -t /usr/share/licenses/libwnck -Dm644 ../COPYING cd ../.. rm -rf libwnck-40.1 # network-manager-applet. -tar -xf network-manager-applet-1.26.0.tar.xz -cd network-manager-applet-1.26.0 +tar -xf network-manager-applet-1.28.0.tar.xz +cd network-manager-applet-1.28.0 mkdir nma-build; cd nma-build meson --prefix=/usr --buildtype=release -Dappindicator=no -Dselinux=false .. ninja ninja install install -t /usr/share/licenses/network-manager-applet -Dm644 ../COPYING cd ../.. -rm -rf network-manager-applet-1.26.0 +rm -rf network-manager-applet-1.28.0 # NetworkManager-openvpn. tar -xf NetworkManager-openvpn-1.8.18.tar.xz cd NetworkManager-openvpn-1.8.18 @@ -5840,15 +5850,15 @@ install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING cd ../.. rm -rf libsoup-3.0.6 # libostree. -tar -xf libostree-2022.3.tar.xz -cd libostree-2022.3 +tar -xf libostree-2022.4.tar.xz +cd libostree-2022.4 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-dracut --with-openssl --enable-experimental-api --disable-static make make install sed -i '/reproducible/d' /etc/dracut.conf.d/ostree.conf install -t /usr/share/licenses/libostree -Dm644 COPYING cd .. -rm -rf libostree-2022.3 +rm -rf libostree-2022.4 # libxmlb. tar -xf libxmlb-0.3.6.tar.gz cd libxmlb-0.3.6 @@ -6106,28 +6116,26 @@ install -t /usr/share/licenses/libcanberra -Dm644 LGPL cd .. rm -rf libcanberra-0.30 # x264. -tar -xf x264-0.164.3094.tar.xz -cd x264-0.164.3094 +tar -xf x264-0.164.3095.tar.xz +cd x264-0.164.3095 ./configure --prefix=/usr --enable-shared make make install ln -sf libx264.so.164 /usr/lib/libx264.so install -t /usr/share/licenses/x264 -Dm644 COPYING cd .. -rm -rf x264-0.164.3094 +rm -rf x264-0.164.3095 # x265. -tar -xf x265-3.5-35-g7a5709048.tar.xz -cd x265-3.5-35-g7a5709048 +tar -xf x265-3.5-37-g9b59d4554.tar.xz +cd x265-3.5-37-g9b59d4554 mkdir x265-build; cd x265-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev -G Ninja ../source ninja ninja install rm -f /usr/lib/libx265.a -ln -sf libx265.so.203 /usr/lib/libx265.so -ldconfig install -t /usr/share/licenses/x265 -Dm644 ../COPYING cd ../.. -rm -rf x265-3.5-35-g7a5709048 +rm -rf x265-3.5-37-g9b59d4554 # libraw1394. tar -xf libraw1394-2.1.2.tar.xz cd libraw1394-2.1.2 @@ -6328,12 +6336,12 @@ install -t /usr/share/licenses/gstreamer-vaapi -Dm644 ../COPYING.LIB cd ../.. rm -rf gstreamer-vaapi-1.20.2 # PipeWire + WirePlumber. -tar -xf pipewire-0.3.51.tar.gz -cd pipewire-0.3.51 -tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects -mv subprojects/wireplumber{-0.4.10,} +tar -xf pipewire-0.3.52.tar.gz +cd pipewire-0.3.52 +mkdir -p subprojects/wireplumber +tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1 mkdir pipewire-build; cd pipewire-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber -Dwireplumber:system-lua=true -Dwireplumber:tests=false .. +meson --prefix=/usr --buildtype=release -Db_pie=false -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber -Dwireplumber:system-lua=true -Dwireplumber:tests=false .. ninja ninja install systemctl --global enable pipewire.socket pipewire-pulse.socket @@ -6342,7 +6350,7 @@ echo "autospawn = no" >> /etc/pulse/client.conf install -t /usr/share/licenses/pipewire -Dm644 ../COPYING install -t /usr/share/licenses/wireplumber -Dm644 ../subprojects/wireplumber/LICENSE cd ../.. -rm -rf pipewire-0.3.51 +rm -rf pipewire-0.3.52 # xdg-desktop-portal. tar -xf xdg-desktop-portal-1.14.4.tar.xz cd xdg-desktop-portal-1.14.4 @@ -6502,14 +6510,14 @@ install -t /usr/share/licenses/libxfce4ui -Dm644 COPYING cd .. rm -rf libxfce4ui-4.17.6 # Exo. -tar -xf exo-4.17.1.tar.bz2 -cd exo-4.17.1 +tar -xf exo-4.17.2.tar.bz2 +cd exo-4.17.2 ./configure --prefix=/usr --sysconfdir=/etc make make install install -t /usr/share/licenses/exo -Dm644 COPYING cd .. -rm -rf exo-4.17.1 +rm -rf exo-4.17.2 # Garcon. tar -xf garcon-4.17.0.tar.bz2 cd garcon-4.17.0 @@ -6856,17 +6864,6 @@ make install install -t /usr/share/licenses/gparted -Dm644 COPYING cd .. rm -rf gparted-GPARTED_1_4_0 -# mtools. -tar -xf mtools-4.0.39.tar.gz -cd mtools-4.0.39 -sed -e '/^SAMPLE FILE$/s:^:# :' -i mtools.conf -./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info -make -make install -install -m644 mtools.conf /etc/mtools.conf -install -t /usr/share/licenses/mtools -Dm644 COPYING -cd .. -rm -rf mtools-4.0.39 # Popsicle. tar -xf popsicle-1.3.0-54-ga1561b3.tar.xz cd popsicle-1.3.0-54-ga1561b3 @@ -7022,7 +7019,7 @@ cat > /usr/share/licenses/firefox/LICENSE << "END" Please type 'about:license' in the Firefox URL box to view the Firefox license. END # Thunderbird. -tar --no-same-owner -xf thunderbird-91.9.1.tar.bz2 -C /usr/lib +tar --no-same-owner -xf thunderbird-91.10.0.tar.bz2 -C /usr/lib mkdir -p /usr/lib/thunderbird/distribution cat > /usr/lib/thunderbird/distribution/policies.json << END { @@ -7061,8 +7058,8 @@ install -t /usr/share/licenses/busybox -Dm644 LICENSE cd .. rm -rf busybox-1.35.0 # Linux Kernel. -tar -xf linux-5.18.1.tar.xz -cd linux-5.18.1 +tar -xf linux-5.18.3.tar.xz +cd linux-5.18.3 cp ../kernel-config .config make olddefconfig make @@ -7098,7 +7095,7 @@ find "$builddir" -type f -name '*.o' -delete ln -sr "$builddir" "/usr/src/linux" install -t /usr/share/licenses/linux -Dm644 COPYING LICENSES/exceptions/* LICENSES/preferred/* cd .. -rm -rf linux-5.18.1 +rm -rf linux-5.18.3 unset builddir # NVIDIA Open kernel modules. tar -xf open-gpu-kernel-modules-515.43.04.tar.gz @@ -7136,6 +7133,7 @@ rm -f /usr/bin/lsof # Unused package managers, potentially dangerous on MassOS. rm -f /usr/bin/{dpkg,dpkg-deb,rpm} # Unneeded. +if [ "$(readlink /usr/bin/resize)" = "/usr/bin/busybox" ]; then rm -f /usr/bin/resize; fi if [ "$(readlink /usr/sbin/httpd)" = "/usr/bin/busybox" ]; then rm -f /usr/sbin/httpd; fi # Remove Debian stuff. rm -rf /etc/kernel @@ -7158,6 +7156,7 @@ rm -rf /tmp/* ldconfig # For massos-upgrade. cat > /tmp/preupgrade << "END" +# Check for a new version of Glibc (breaks this utility). if [ "$(ldd --version | head -n1 | cut -d' ' -f4)" != "2.35" ]; then echo " IMPORTANT: This upgrade includes a newer version of the core C library (glibc). @@ -7170,6 +7169,12 @@ your apps or data. For information on how to do this, see the following URL: " >&2 exit 1 fi +# Notice for massos-upgrade. +echo "Note: Upgrading using the Live CD is preferred. For information, see" >&2 +echo "." >&2 +echo "The upgrade will begin in 10 seconds. To cancel, press Control+C and" >&2 +echo "no changes will be made to your computer." >&2 +sleep 10 END cat > /tmp/postupgrade << "END" if ! grep -q nm-openvpn /etc/group; then @@ -7186,6 +7191,7 @@ fi test ! -e /etc/ld.so.conf.d/firefox-libav.conf || rm -f /etc/ld.so.conf.d/firefox-libav.conf test ! -d /usr/lib/firefox/libav || rm -rf /usr/lib/firefox/libav # Unneeded. +if [ "$(readlink /usr/bin/resize)" = "/usr/bin/busybox" ]; then rm -f /usr/bin/resize; fi if [ "$(readlink /usr/sbin/httpd)" = "/usr/bin/busybox" ]; then rm -f /usr/sbin/httpd; fi # Now using BGRT theme instead of spinner. ! grep -q "Theme=spinner" /etc/plymouth/plymouthd.conf || plymouth-set-default-theme bgrt diff --git a/changelog.md b/changelog.md index dc61aaa..dfe88c6 100644 --- a/changelog.md +++ b/changelog.md @@ -8,15 +8,39 @@ Changes: Upgraded software: +- alsa-lib: `1.2.6.1 --> 1.2.7` +- btrfs-progs: `5.18 --> 5.18.1` +- DirectX-Headers: `1.600.10 --> 1.602.0` +- Exo: `4.17.1 --> 4.17.2` +- File: `5.41 --> 5.42` - Graphviz: `3.0.0 --> 4.0.0` - htop: `3.1.2 --> 3.2.1` - hwdata: `0.359 --> 0.360` - ISO-Codes: `4.9.0 --> 4.10.0` +- JasPer: `3.0.3 --> 3.0.4` - kbd: `2.4.0 --> 2.5.0` +- libdrm: `2.4.110 --> 2.4.111` +- libostree: `2022.3 --> 2022.4` +- librsvg: `2.54.3 --> 2.54.4` +- Linux Kernel: `5.18.1 --> 5.18.3` +- lxml: `4.8.0 --> 4.9.0` - Mesa: `22.1.0 --> 22.1.1` - Meson: `0.62.1 --> 0.62.2` +- mtools: `4.0.39 --> 4.0.40` +- Nettle: `3.7.3 --> 3.8` +- network-manager-applet: `1.26.0 --> 1.28.0` +- ntfs-3g: `2021.8.22 --> 2022.5.17` +- PipeWire: `0.3.51 --> 0.3.52` - Poppler: `22.05.0 --> 22.06.0` +- Python: `3.10.4 --> 3.10.5` +- Sudo: `1.9.10 --> 1.9.11p1` - systemd: `251.1 --> 251.2` +- Thunderbird: `91.9.1 --> 91.10.0` +- UPower: `0.99.18 --> 0.99.19` +- x264: `0.164.3094 --> 0.164.3095` +- x265: `3.5-35-g7a5709048 --> 3.5-37-g9b59d4554` +- xfsprogs: `5.16.0 --> 5.18.0` +- xkeyboard-config: `2.35.1 --> 2.36` # MassOS 2022.06 Changes: diff --git a/source-urls b/source-urls index 00a20a4..df01dc8 100644 --- a/source-urls +++ b/source-urls @@ -3,7 +3,7 @@ https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar https://de.freedif.org/savannah/acl/acl-2.3.1.tar.xz https://archive.massos.org/sources/acpi-1.7.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz -https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.6.1.tar.bz2 +https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.tar.bz2 https://launchpad.net/apparmor/3.0/3.0.4/+download/apparmor-3.0.4.tar.gz https://www.freedesktop.org/software/appstream/releases/AppStream-0.15.4.tar.xz https://github.com/hughsie/appstream-glib/archive/refs/tags/appstream_glib_0_7_18.tar.gz @@ -35,7 +35,7 @@ https://cdn.kernel.org/pub/linux/bluetooth/bluez-5.64.tar.xz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz https://archive.massos.org/sources/bsd-games-3.1.tar.gz -https://cdn.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.tar.xz +https://cdn.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.1.tar.xz https://github.com/projectatomic/bubblewrap/releases/download/v0.6.2/bubblewrap-0.6.2.tar.xz https://www.busybox.net/downloads/busybox-1.35.0.tar.bz2 https://www.sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz @@ -75,7 +75,7 @@ https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-ut https://ftp.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3.tar.gz https://invisible-mirror.net/archives/dialog/dialog-1.3-20220526.tgz https://mirror.lyrahosting.com/gnu/diffutils/diffutils-3.8.tar.xz -https://github.com/microsoft/DirectX-Headers/archive/v1.600.10/DirectX-Headers-1.600.10.tar.gz +https://github.com/microsoft/DirectX-Headers/archive/v1.602.0/DirectX-Headers-1.602.0.tar.gz https://github.com/python-distro/distro/archive/v1.6.0/distro-1.6.0.tar.gz https://archive.massos.org/sources/djvulibre-3.5.28.tar.gz https://github.com/dell/dkms/archive/v3.0.3/dkms-3.0.3.tar.gz @@ -105,14 +105,14 @@ https://github.com/AbiWord/enchant/releases/download/v2.3.3/enchant-2.3.3.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/evince/42/evince-42.3.tar.xz https://deb.debian.org/debian/pool/main/e/exfatprogs/exfatprogs_1.1.3.orig.tar.xz https://github.com/Exiv2/exiv2/releases/download/v0.27.5/exiv2-0.27.5-Source.tar.gz -https://archive.fr.xfce.org/src/xfce/exo/4.17/exo-4.17.1.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/exo/4.17/exo-4.17.2.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz https://github.com/knik0/faad2/archive/2_10_0/faad2-2_10_0.tar.gz https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.29.orig.tar.gz https://github.com/yo8192/fcron/archive/ver3_3_1/fcron-ver3_3_1.tar.gz https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz https://archive-4.kali.org/kali/pool/main/f/figlet/figlet_2.2.5.orig.tar.gz -https://astron.com/pub/file/file-5.41.tar.gz +https://astron.com/pub/file/file-5.42.tar.gz https://mirror.lyrahosting.com/gnu/findutils/findutils-4.9.0.tar.xz https://archive.mozilla.org/pub/firefox/releases/91.10.0esr/source/firefox-91.10.0esr.source.tar.xz https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/en-US/firefox-101.0.tar.bz2 @@ -127,7 +127,7 @@ https://github.com/fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar. https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz https://github.com/libfuse/libfuse/releases/download/fuse-3.11.0/fuse-3.11.0.tar.xz https://github.com/galculator/galculator/archive/v2.1.4/galculator-2.1.4.tar.gz -https://archive.fr.xfce.org/src/xfce/garcon/4.17/garcon-4.17.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/garcon/4.17/garcon-4.17.0.tar.bz2 https://mirror.lyrahosting.com/gnu/gawk/gawk-5.1.0.tar.xz https://mirror.lyrahosting.com/gnu/gcc/gcc-12.1.0/gcc-12.1.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gcr/3.41/gcr-3.41.0.tar.xz @@ -206,7 +206,7 @@ https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.10.0.orig.tar.xz https://archive.massos.org/sources/itstool-2.0.7.tar.bz2 https://github.com/jackaudio/jack2/archive/v1.9.21/jack2-1.9.21.tar.gz https://digip.org/jansson/releases/jansson-2.13.1.tar.gz -https://github.com/jasper-software/jasper/archive/version-3.0.3/jasper-version-3.0.3.tar.gz +https://github.com/jasper-software/jasper/archive/version-3.0.4/jasper-version-3.0.4.tar.gz https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-3.1.1.tar.gz https://www.cpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.06.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz @@ -227,7 +227,7 @@ https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2 https://archive-4.kali.org/kali/pool/main/liba/libatasmart/libatasmart_0.19.orig.tar.xz http://mirror.lyrahosting.com/gentoo/distfiles/libavc1394-0.5.4.tar.gz -https://github.com/storaged-project/libblockdev/releases/download/2.26-1/libblockdev-2.26.tar.gz +https://github.com/storaged-project/libblockdev/releases/download/2.27-1/libblockdev-2.27.tar.gz https://videolan.mirrors.nublue.co.uk/libbluray/1.3.0/libbluray-1.3.0.tar.bz2 https://files.libburnia-project.org/releases/libburn-1.5.4.tar.gz https://github.com/storaged-project/libbytesize/releases/download/2.7/libbytesize-2.7.tar.gz @@ -239,7 +239,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/libchamplain/0.12/libchamplain-0.12.20. https://archive-4.kali.org/kali/pool/main/libd/libdaemon/libdaemon_0.14.orig.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/libdazzle/3.44/libdazzle-3.44.0.tar.xz https://www.x.org/archive/individual/lib/libdmx-1.1.4.tar.bz2 -https://dri.freedesktop.org/libdrm/libdrm-2.4.110.tar.xz +https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz https://videolan.mirrors.nublue.co.uk/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2 https://videolan.mirrors.nublue.co.uk/libdvdread/6.1.3/libdvdread-6.1.3.tar.bz2 https://github.com/anholt/libepoxy/archive/1.5.10/libepoxy-1.5.10.tar.gz @@ -285,7 +285,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/libnma/1.8/libnma-1.8.38.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/libnotify/0.7/libnotify-0.7.12.tar.xz https://github.com/thkukuk/libnsl/releases/download/v2.0.0/libnsl-2.0.0.tar.xz https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz -https://github.com/ostreedev/ostree/releases/download/v2022.3/libostree-2022.3.tar.xz +https://github.com/ostreedev/ostree/releases/download/v2022.4/libostree-2022.4.tar.xz https://deb.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz https://www.x.org/archive/individual/lib/libpciaccess-0.16.tar.bz2 @@ -299,7 +299,7 @@ https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4. https://www.freedesktop.org/software/libqmi/libqmi-1.30.6.tar.xz https://www.libraw.org/data/LibRaw-0.20.2.tar.gz https://cdn.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz -https://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.54/librsvg-2.54.3.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.54/librsvg-2.54.4.tar.xz https://github.com/libsndfile/libsamplerate/releases/download/0.2.2/libsamplerate-0.2.2.tar.xz https://github.com/sass/libsass/archive/3.6.5/libsass-3.6.5.tar.gz https://github.com/seccomp/libseccomp/releases/download/v2.5.4/libseccomp-2.5.4.tar.gz @@ -342,8 +342,8 @@ https://www.x.org/archive/individual/lib/libxcvt-0.1.1.tar.xz https://www.x.org/archive/individual/lib/libXdamage-1.1.5.tar.bz2 https://www.x.org/archive/individual/lib/libXdmcp-1.1.3.tar.bz2 https://www.x.org/archive/individual/lib/libXext-1.3.4.tar.bz2 -https://archive.fr.xfce.org/src/xfce/libxfce4ui/4.17/libxfce4ui-4.17.6.tar.bz2 -https://archive.fr.xfce.org/src/xfce/libxfce4util/4.17/libxfce4util-4.17.2.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/libxfce4ui/4.17/libxfce4ui-4.17.6.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/libxfce4util/4.17/libxfce4util-4.17.2.tar.bz2 https://www.x.org/archive/individual/lib/libXfixes-6.0.0.tar.bz2 https://www.x.org/archive/individual/lib/libXfont2-2.0.5.tar.bz2 https://www.x.org/archive/individual/lib/libXft-2.3.4.tar.bz2 @@ -371,9 +371,8 @@ https://www.x.org/archive/individual/lib/libXxf86vm-1.1.4.tar.bz2 https://libzip.org/download/libzip-1.8.0.tar.xz https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz -https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.1.tar.xz +https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz -https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2-docs.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/lld-14.0.4.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/llvm-14.0.4.src.tar.xz https://github.com/lm-sensors/lm-sensors/archive/V3-6-0/lm-sensors-3-6-0.tar.gz @@ -385,7 +384,7 @@ https://github.com/lsof-org/lsof/releases/download/4.95.0/lsof_4.95.0.linux.tar. https://www.lua.org/ftp/lua-5.4.4.tar.gz https://www.x.org/archive/individual/app/luit-1.1.1.tar.bz2 https://sourceware.org/pub/lvm2/LVM2.2.03.16.tgz -https://files.pythonhosted.org/packages/source/l/lxml/lxml-4.8.0.tar.gz +https://files.pythonhosted.org/packages/source/l/lxml/lxml-4.9.0.tar.gz https://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.9rel.1.tar.bz2 https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz https://download.savannah.nongnu.org/releases/lzip/lzip-1.22.tar.gz @@ -409,13 +408,13 @@ https://www.x.org/archive/individual/app/mkfontscale-1.2.2.tar.xz https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/20220511/mobile-broadband-provider-info-20220511.tar.bz2 https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.8.tar.xz https://deb.debian.org/debian/pool/main/m/moreutils/moreutils_0.67.orig.tar.gz -https://archive.fr.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.9.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/mousepad/0.5/mousepad-0.5.9.tar.bz2 https://mirror.lyrahosting.com/gnu/mpc/mpc-1.2.1.tar.gz https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz https://mirror.lyrahosting.com/gnu/mpfr/mpfr-4.1.0.tar.xz https://mpg123.org/download/mpg123-1.29.3.tar.bz2 https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2 -https://mirror.lyrahosting.com/gnu/mtools/mtools-4.0.39.tar.gz +https://mirror.lyrahosting.com/gnu/mtools/mtools-4.0.40.tar.gz https://github.com/bluesabre/mugshot/releases/download/mugshot-0.4.3/mugshot-0.4.3.tar.gz https://www.mupdf.com/downloads/archive/mupdf-1.19.1-source.tar.gz https://nano-editor.org/dist/v6/nano-6.3.tar.xz @@ -424,8 +423,8 @@ https://mirror.lyrahosting.com/gnu/ncurses/ncurses-6.3.tar.gz https://github.com/TheSonicMaster/neofetch/archive/bc2a8e60dbbd3674f4fa4dd167f904116eb07055/neofetch-bc2a8e60dbbd3674f4fa4dd167f904116eb07055.tar.gz https://archive.massos.org/sources/net-snmp-5.9.1.tar.xz https://archive.massos.org/sources/netcat-0.7.1.tar.xz -https://mirror.lyrahosting.com/gnu/nettle/nettle-3.7.3.tar.gz -https://ftp.acc.umu.se/pub/gnome/sources/network-manager-applet/1.26/network-manager-applet-1.26.0.tar.xz +https://mirror.lyrahosting.com/gnu/nettle/nettle-3.8.tar.gz +https://ftp.acc.umu.se/pub/gnome/sources/network-manager-applet/1.28/network-manager-applet-1.28.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager/1.38/NetworkManager-1.38.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.18.tar.xz https://releases.pagure.org/newt/newt-0.52.21.tar.gz @@ -435,7 +434,7 @@ https://gitlab.com/TheSonicMaster/noto-fonts-tarball/-/raw/3/noto-fonts3.tar.xz https://www.gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2 https://archive.mozilla.org/pub/nspr/releases/v4.34/src/nspr-4.34.tar.gz https://github.com/nss-dev/nss/archive/NSS_3_79_RTM/nss-NSS_3_79_RTM.tar.gz -https://github.com/tuxera/ntfs-3g/archive/2021.8.22/ntfs-3g-2021.8.22.tar.gz +https://github.com/tuxera/ntfs-3g/archive/2022.5.17/ntfs-3g-2022.5.17.tar.gz https://github.com/NVIDIA/open-gpu-kernel-modules/archive/515.43.04/open-gpu-kernel-modules-515.43.04.tar.gz https://github.com/kcat/openal-soft/archive/1.21.1/openal-soft-1.21.1.tar.gz https://github.com/cisco/openh264/archive/v2.1.1/openh264-2.1.1.tar.gz @@ -447,7 +446,7 @@ https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.0p1.tar.gz https://www.openssl.org/source/openssl-3.0.3.tar.gz https://github.com/OpenVPN/openvpn/archive/v2.5.7/openvpn-2.5.7.tar.gz https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz -https://archive.fr.xfce.org/src/apps/orage/4.16/orage-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/orage/4.16/orage-4.16.0.tar.bz2 https://gitlab.freedesktop.org/gstreamer/orc/-/archive/0.4.32/orc-0.4.32.tar.gz https://deb.debian.org/debian/pool/main/o/os-prober/os-prober_1.79.tar.xz https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz @@ -456,7 +455,7 @@ https://github.com/pypa/packaging/releases/download/21.3/packaging-21.3.tar.gz https://archive.massos.org/sources/pahole-1.23.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/pango/1.50/pango-1.50.7.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/pangomm/2.46/pangomm-2.46.2.tar.xz -https://archive.fr.xfce.org/src/apps/parole/4.16/parole-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/parole/4.16/parole-4.16.0.tar.bz2 https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz https://mirror.lyrahosting.com/gnu/parted/parted-3.5.tar.xz https://mirror.lyrahosting.com/gnu/patch/patch-2.7.6.tar.xz @@ -471,7 +470,7 @@ https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.29.0/p https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz https://deb.debian.org/debian/pool/main/p/pigz/pigz_2.6.orig.tar.xz https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2 -https://github.com/PipeWire/pipewire/archive/0.3.51/pipewire-0.3.51.tar.gz +https://github.com/PipeWire/pipewire/archive/0.3.52/pipewire-0.3.52.tar.gz https://www.cairographics.org/releases/pixman-0.40.0.tar.gz https://files.pythonhosted.org/packages/source/p/ply/ply-3.11.tar.gz https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz @@ -494,7 +493,7 @@ https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.12.0.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/pygobject/3.42/pygobject-3.42.1.tar.xz https://github.com/pyca/pyopenssl/archive/22.0.0/pyopenssl-22.0.0.tar.gz https://github.com/pyparsing/pyparsing/archive/pyparsing_3.0.7.tar.gz -https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz +https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tar.xz https://github.com/martinpitt/python-dbusmock/releases/download/0.27.5/python-dbusmock-0.27.5.tar.gz https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3/qpdf-10.6.3.tar.gz @@ -542,7 +541,7 @@ https://archive.massos.org/sources/squashfs-tools-4.5.tar.xz https://github.com/vasi/squashfuse/releases/download/0.1.104/squashfuse-0.1.104.tar.gz https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.3/sshfs-3.7.3.tar.xz https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz -https://www.sudo.ws/sudo/dist/sudo-1.9.10.tar.gz +https://www.sudo.ws/sudo/dist/sudo-1.9.11p1.tar.gz https://archive.massos.org/sources/swig-4.0.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz @@ -552,15 +551,15 @@ https://archive.massos.org/sources/tcl8.6.12-src.tar.gz https://github.com/dbrgn/tealdeer/archive/v1.5.0/tealdeer-1.5.0.tar.gz https://mirror.lyrahosting.com/gnu/texinfo/texinfo-6.8.tar.xz https://archive.massos.org/sources/thin-provisioning-tools-0.9.0.tar.gz -https://archive.fr.xfce.org/src/xfce/thunar/4.17/thunar-4.17.8.tar.bz2 -https://archive.fr.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.5/thunar-archive-plugin-0.5.0.tar.bz2 -https://archive.fr.xfce.org/src/xfce/thunar-volman/4.16/thunar-volman-4.16.0.tar.bz2 -https://archive.mozilla.org/pub/thunderbird/releases/91.9.1/linux-x86_64/en-US/thunderbird-91.9.1.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/thunar/4.17/thunar-4.17.8.tar.bz2 +https://mirror.netcologne.de/xfce/src/thunar-plugins/thunar-archive-plugin/0.5/thunar-archive-plugin-0.5.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/thunar-volman/4.16/thunar-volman-4.16.0.tar.bz2 +https://archive.mozilla.org/pub/thunderbird/releases/91.10.0/linux-x86_64/en-US/thunderbird-91.10.0.tar.bz2 https://archive.massos.org/sources/tk8.6.12-src.tar.gz https://files.pythonhosted.org/packages/source/t/toml/toml-0.10.2.tar.gz https://github.com/tpm2-software/tpm2-tss/releases/download/3.2.0/tpm2-tss-3.2.0.tar.gz https://archive.massos.org/sources/tree-2.0.2.tgz -https://archive.fr.xfce.org/src/xfce/tumbler/4.17/tumbler-4.17.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/tumbler/4.17/tumbler-4.17.0.tar.bz2 https://github.com/njh/twolame/releases/download/0.4.0/twolame-0.4.0.tar.gz https://files.pythonhosted.org/packages/45/6b/44f7f8f1e110027cf88956b59f2fad776cca7e1704396d043f89effd3a0e/typing_extensions-4.1.1-py3-none-any.whl https://files.pythonhosted.org/packages/source/t/typogrify/typogrify-2.0.7.tar.gz @@ -568,7 +567,7 @@ https://www.iana.org/time-zones/repository/releases/tzdata2022a.tar.gz https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2 https://unifoundry.com/pub/unifont/unifont-14.0.03/font-builds/unifont-14.0.03.pcf.gz https://archive.massos.org/sources/unzip60.tar.gz -https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.18/upower-v0.99.18.tar.bz2 +https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.19/upower-v0.99.19.tar.bz2 https://github.com/urllib3/urllib3/releases/download/1.26.9/urllib3-1.26.9.tar.gz https://cdn.kernel.org/pub/linux/utils/usb/usbutils/usbutils-014.tar.xz https://lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2 @@ -595,8 +594,8 @@ https://deb.debian.org/debian/pool/main/w/woff2/woff2_1.0.2.orig.tar.gz https://w1.fi/releases/wpa_supplicant-2.10.tar.gz https://wpewebkit.org/releases/wpebackend-fdo-1.12.0.tar.xz https://www.x.org/archive/individual/app/x11perf-1.6.1.tar.bz2 -https://archive.massos.org/sources/x264-0.164.3094.tar.xz -https://archive.massos.org/sources/x265-3.5-35-g7a5709048.tar.xz +https://archive.massos.org/sources/x264-0.164.3095.tar.xz +https://archive.massos.org/sources/x265-3.5-37-g9b59d4554.tar.xz https://github.com/ib/xarchiver/archive/0.5.4.17/xarchiver-0.5.4.17.tar.gz https://www.x.org/archive/individual/app/xauth-1.1.2.tar.xz https://www.x.org/archive/individual/app/xbacklight-1.2.3.tar.bz2 @@ -629,32 +628,32 @@ https://www.x.org/archive/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 https://archive.massos.org/sources/xf86-video-intel-20211007.tar.xz https://www.x.org/archive/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2 https://www.x.org/archive/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfburn/0.6/xfburn-0.6.2.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfce4-appfinder/4.17/xfce4-appfinder-4.17.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfburn/0.6/xfburn-0.6.2.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfce4-appfinder/4.17/xfce4-appfinder-4.17.0.tar.bz2 https://deb.debian.org/debian/pool/main/x/xfce4-artwork/xfce4-artwork_0.1.1a~git+20110420.orig.tar.gz -https://archive.fr.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.2.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.3.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.0.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfce4-power-manager/4.16/xfce4-power-manager-4.16.0.tar.bz2 -https://archive.fr.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.3.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.10.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfce4-session/4.16/xfce4-session-4.16.0.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.2.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.4.tar.bz2 -https://archive.fr.xfce.org/src/apps/xfce4-terminal/1.0/xfce4-terminal-1.0.4.tar.bz2 -https://archive.fr.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.6/xfce4-whiskermenu-plugin-2.6.1.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfconf/4.16/xfconf-4.16.0.tar.bz2 -https://archive.fr.xfce.org/src/xfce/xfdesktop/4.16/xfdesktop-4.16.0.tar.bz2 -https://cdn.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.16.0.tar.xz -https://archive.fr.xfce.org/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2 +https://mirror.netcologne.de/xfce/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.2.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.3.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfce4-power-manager/4.16/xfce4-power-manager-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.3.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.10.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfce4-session/4.16/xfce4-session-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.2.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.4.tar.bz2 +https://mirror.netcologne.de/xfce/src/apps/xfce4-terminal/1.0/xfce4-terminal-1.0.4.tar.bz2 +https://mirror.netcologne.de/xfce/src/panel-plugins/xfce4-whiskermenu-plugin/2.6/xfce4-whiskermenu-plugin-2.6.1.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfconf/4.16/xfconf-4.16.0.tar.bz2 +https://mirror.netcologne.de/xfce/src/xfce/xfdesktop/4.16/xfdesktop-4.16.0.tar.bz2 +https://cdn.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.18.0.tar.xz +https://mirror.netcologne.de/xfce/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2 https://www.x.org/archive/individual/app/xgamma-1.0.6.tar.bz2 https://www.x.org/archive/individual/app/xhost-1.0.8.tar.bz2 https://www.x.org/archive/individual/app/xinput-1.6.3.tar.bz2 https://www.x.org/archive/individual/app/xkbcomp-1.4.5.tar.bz2 https://www.x.org/archive/individual/app/xkbevd-1.1.4.tar.bz2 https://www.x.org/archive/individual/app/xkbutils-1.0.4.tar.bz2 -https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.35.1.tar.xz +https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.36.tar.xz https://www.x.org/archive/individual/app/xkill-1.0.5.tar.bz2 https://www.x.org/archive/individual/app/xinit-1.4.1.tar.bz2 https://www.x.org/archive/individual/app/xlsatoms-1.1.3.tar.bz2 diff --git a/stage1.sh b/stage1.sh index 749970c..d2d902c 100755 --- a/stage1.sh +++ b/stage1.sh @@ -72,14 +72,14 @@ cat gcc/limitx.h gcc/glimits.h gcc/limity.h > `dirname $($MASSOS_TARGET-gcc -pri cd .. rm -rf gcc-12.1.0 # Linux API Headers. -tar -xf linux-5.18.1.tar.xz -cd linux-5.18.1 +tar -xf linux-5.18.3.tar.xz +cd linux-5.18.3 make headers find usr/include -name '.*' -delete rm usr/include/Makefile cp -r usr/include "$MASSOS"/usr cd .. -rm -rf linux-5.18.1 +rm -rf linux-5.18.3 # Glibc tar -xf glibc-2.35.tar.xz cd glibc-2.35 @@ -156,8 +156,8 @@ make DESTDIR="$MASSOS" install cd .. rm -rf diffutils-3.8 # File -tar -xf file-5.41.tar.gz -cd file-5.41 +tar -xf file-5.42.tar.gz +cd file-5.42 mkdir build; cd build ../configure --disable-bzlib --disable-libseccomp --disable-xzlib --disable-zlib make @@ -166,7 +166,7 @@ cd .. make FILE_COMPILE=$(pwd)/build/src/file make DESTDIR="$MASSOS" install cd .. -rm -rf file-5.41 +rm -rf file-5.42 # Findutils. tar -xf findutils-4.9.0.tar.xz cd findutils-4.9.0 diff --git a/utils/build-configs/kernel-config b/utils/build-configs/kernel-config index 25938af..5cdf5c0 100644 --- a/utils/build-configs/kernel-config +++ b/utils/build-configs/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.1 Kernel Configuration +# Linux/x86 5.18.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (MassOS GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=123 @@ -2355,6 +2356,7 @@ CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y CONFIG_EFI_EARLYCON=y CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set # # Tegra firmware driver @@ -5950,7 +5952,7 @@ CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m CONFIG_CIO2_BRIDGE=y -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK=m From 1266206944c8284afccdff16fdcffea4c25412a1 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sun, 12 Jun 2022 10:42:44 +0100 Subject: [PATCH 10/32] Add dmraid for libblockdev --- build-system.sh | 11 ++++++++++- source-urls | 1 + utils/builtins | 1 + utils/systemd-units/dmraid.service | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 utils/systemd-units/dmraid.service diff --git a/build-system.sh b/build-system.sh index a657fbc..5ae1c4b 100755 --- a/build-system.sh +++ b/build-system.sh @@ -2049,6 +2049,15 @@ make install_systemd_units install -t /usr/share/licenses/lvm2 -Dm644 COPYING{,.BSD,.LIB} cd .. rm -rf LVM2.2.03.16 +# dmraid. +tar -xf dmraid-1.0.0.rc16-3.tar.bz2 +cd dmraid/1.0.0.rc16-3/dmraid +./configure --prefix=/usr --enable-led --enable-intel_led +make -j1 +make -j1 install +install -t /usr/share/licenses/dmraid -Dm644 LICENSE{,_GPL,_LGPL} +cd ../../.. +rm -rf dmraid # btrfs-progs. tar -xf btrfs-progs-v5.18.1.tar.xz cd btrfs-progs-v5.18.1 @@ -3321,7 +3330,7 @@ rm -rf libbytesize-2.7 # libblockdev. tar -xf libblockdev-2.27.tar.gz cd libblockdev-2.27 -./configure --prefix=/usr --sysconfdir=/etc --with-python3 +./configure --prefix=/usr --sysconfdir=/etc --with-python3 --without-nvdimm make make install install -t /usr/share/licenses/libblockdev -Dm644 LICENSE diff --git a/source-urls b/source-urls index df01dc8..7c09021 100644 --- a/source-urls +++ b/source-urls @@ -81,6 +81,7 @@ https://archive.massos.org/sources/djvulibre-3.5.28.tar.gz https://github.com/dell/dkms/archive/v3.0.3/dkms-3.0.3.tar.gz https://deb.debian.org/debian/pool/main/d/dmg2img/dmg2img_1.6.7.orig.tar.gz https://download.savannah.nongnu.org/releases/dmidecode/dmidecode-3.3.tar.xz +https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://files.pythonhosted.org/packages/source/d/dnspython/dnspython-2.2.0.tar.gz https://www.docbook.org/sgml/3.1/docbk31.zip https://www.docbook.org/sgml/4.5/docbook-4.5.zip diff --git a/utils/builtins b/utils/builtins index a51c1df..239722d 100644 --- a/utils/builtins +++ b/utils/builtins @@ -75,6 +75,7 @@ djvulibre dkms dmg2img dmidecode +dmraid dnspython docbook-dsssl docbook-sgml diff --git a/utils/systemd-units/dmraid.service b/utils/systemd-units/dmraid.service new file mode 100644 index 0000000..c5d3d53 --- /dev/null +++ b/utils/systemd-units/dmraid.service @@ -0,0 +1,15 @@ +[Unit] +Description=Assemble FakeRAID arrays +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z +RemainAfterExit=true + +[Install] +WantedBy=basic.target From 58d03213f3d72b5d20b56b7e39180300e0b0ce43 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Tue, 14 Jun 2022 22:17:13 +0100 Subject: [PATCH 11/32] Don't disable systemd firstboot and ldconfig --- build-system.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-system.sh b/build-system.sh index 5ae1c4b..b299784 100755 --- a/build-system.sh +++ b/build-system.sh @@ -1834,7 +1834,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dfirstboot=false -Dhomed=false -Dinstall-tests=false -Dldconfig=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=false -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=false .. ninja ninja install systemd-machine-id-setup @@ -4043,7 +4043,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dfirstboot=false -Dhomed=true -Dinstall-tests=false -Dldconfig=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=true .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=true -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=true .. ninja ninja install cat > /etc/pam.d/systemd-user << END From c270c8e1a192269ebf9f8a83444ff54129721462 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 15 Jun 2022 12:51:07 +0100 Subject: [PATCH 12/32] Enable gpm service --- build-system.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-system.sh b/build-system.sh index b299784..41ee501 100755 --- a/build-system.sh +++ b/build-system.sh @@ -1840,6 +1840,7 @@ ninja install systemd-machine-id-setup systemctl preset-all systemctl disable systemd-time-wait-sync.service +systemctl enable gpm.service cat >> /etc/pam.d/system-session << END session required pam_loginuid.so session optional pam_systemd.so From c6833aebec84ee568eeb844185d7a40df06a544f Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 15 Jun 2022 12:57:06 +0100 Subject: [PATCH 13/32] ... After installing the units --- build-system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-system.sh b/build-system.sh index 41ee501..41e4b4e 100755 --- a/build-system.sh +++ b/build-system.sh @@ -1840,7 +1840,6 @@ ninja install systemd-machine-id-setup systemctl preset-all systemctl disable systemd-time-wait-sync.service -systemctl enable gpm.service cat >> /etc/pam.d/system-session << END session required pam_loginuid.so session optional pam_systemd.so @@ -1860,6 +1859,7 @@ END install -t /usr/share/licenses/systemd -Dm644 ../LICENSE.GPL2 ../LICENSE.LGPL2.1 ../LICENSES/* cd ../.. cp systemd-units/* /usr/lib/systemd/system +systemctl enable gpm.service rm -rf systemd-stable-251.2 # D-Bus (initial build; will be rebuilt later for X and libaudit support). tar -xf dbus-1.14.0.tar.xz From dda8b94ac58ea4ec04f33a274fd9906d5235be25 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 15 Jun 2022 16:06:51 +0100 Subject: [PATCH 14/32] Build SPIRV-Headers separate to glslang --- build-system.sh | 41 ++++++++++++++++++++++++----------------- changelog.md | 2 ++ source-urls | 4 ++-- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/build-system.sh b/build-system.sh index 41e4b4e..10ec3a3 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3874,26 +3874,33 @@ ninja install install -t /usr/share/licenses/directx-headers -Dm644 ../LICENSE cd ../.. rm -rf DirectX-Headers-1.602.0 -# glslang. -tar -xf glslang-11.9.0.tar.gz -cd glslang-11.9.0 -tar -xf ../SPIRV-Tools-2022.2.tar.gz -C External -mv External/{SPIRV-Tools-2022.2,spirv-tools} -tar -xf ../SPIRV-Headers-sdk-1.3.204.1.tar.gz -C External/spirv-tools/external -mv External/spirv-tools/external/{SPIRV-Headers-sdk-1.3.204.1,spirv-headers} -mkdir static-release; cd static-release -cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF -Wno-dev -G Ninja .. -ninja -ninja install -mkdir ../shared-release; cd ../shared-release -cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -Wno-dev -G Ninja .. +# SPIRV-Headers. +tar -xf SPIRV-Headers-sdk-1.3.216.0.tar.gz +cd SPIRV-Headers-sdk-1.3.216.0 +mkdir SPIRV-Headers-build; cd SPIRV-Headers-build +cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev -G Ninja .. ninja ninja install -install -t /usr/share/licenses/glslang -Dm644 ../LICENSE.txt -install -t /usr/share/licenses/spirv-tools -Dm644 ../External/spirv-tools/LICENSE -install -t /usr/share/licenses/spirv-headers -Dm644 ../External/spirv-tools/external/spirv-headers/LICENSE +install -t /usr/share/licenses/spirv-headers -Dm644 ../LICENSE cd ../.. -rm -rf glslang-11.9.0 +rm -rf SPIRV-Headers-sdk-1.3.216.0 +# glslang. +tar -xf glslang-11.10.0.tar.gz +cd glslang-11.10.0 +mkdir -p External/spirv-tools +tar -xf ../SPIRV-Tools-2022.2.tar.gz -C External/spirv-tools --strip-components=1 +mkdir static-build; cd static-build +cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF -DSPIRV-Headers_SOURCE_DIR=/usr -Wno-dev -G Ninja .. +ninja +mkdir ../shared-build; cd ../shared-build +cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -DSPIRV-Headers_SOURCE_DIR=/usr -Wno-dev -G Ninja .. +ninja +cd .. +ninja -C static-build install +ninja -C shared-build install +install -t /usr/share/licenses/glslang -Dm644 LICENSE.txt +cd .. +rm -rf glslang-11.10.0 # Vulkan-Headers. tar -xf Vulkan-Headers-1.3.213.tar.gz cd Vulkan-Headers-1.3.213 diff --git a/changelog.md b/changelog.md index dfe88c6..bc1044b 100644 --- a/changelog.md +++ b/changelog.md @@ -13,6 +13,7 @@ Upgraded software: - DirectX-Headers: `1.600.10 --> 1.602.0` - Exo: `4.17.1 --> 4.17.2` - File: `5.41 --> 5.42` +- glslang: `11.9.0 --> 11.10.0` - Graphviz: `3.0.0 --> 4.0.0` - htop: `3.1.2 --> 3.2.1` - hwdata: `0.359 --> 0.360` @@ -33,6 +34,7 @@ Upgraded software: - PipeWire: `0.3.51 --> 0.3.52` - Poppler: `22.05.0 --> 22.06.0` - Python: `3.10.4 --> 3.10.5` +- SPIRV-Headers: `1.3.204.1 --> 1.3.216.0` - Sudo: `1.9.10 --> 1.9.11p1` - systemd: `251.1 --> 251.2` - Thunderbird: `91.9.1 --> 91.10.0` diff --git a/source-urls b/source-urls index 7c09021..9374d0b 100644 --- a/source-urls +++ b/source-urls @@ -146,7 +146,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz https://mirror.lyrahosting.com/gnu/glibc/glibc-2.35.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/glibmm/2.66/glibmm-2.66.4.tar.xz -https://github.com/KhronosGroup/glslang/archive/11.9.0/glslang-11.9.0.tar.gz +https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz https://archive.mesa3d.org/glu/glu-9.0.2.tar.xz https://mirror.lyrahosting.com/gnu/gmp/gmp-6.2.1.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/3.44/gnome-online-accounts-3.44.0.tar.xz @@ -535,7 +535,7 @@ https://www.surina.net/soundtouch/soundtouch-2.3.1.tar.gz https://downloads.xiph.org/releases/speex/speex-1.2.0.tar.gz https://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz https://archive.massos.org/workdev/sphinx-4.5.0-x86_64-venv.tar.xz -https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.204.1/SPIRV-Headers-sdk-1.3.204.1.tar.gz +https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.216.0/SPIRV-Headers-sdk-1.3.216.0.tar.gz https://github.com/KhronosGroup/SPIRV-Tools/archive/v2022.2/SPIRV-Tools-2022.2.tar.gz https://sqlite.org/2022/sqlite-autoconf-3380500.tar.gz https://archive.massos.org/sources/squashfs-tools-4.5.tar.xz From f94dd3097d2ef228295ea0d0549aee6f52418b94 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 18 Jun 2022 12:10:33 +0100 Subject: [PATCH 15/32] Many package updates and fixes --- build-system.sh | 229 +++++++++--------- changelog.md | 23 +- patches/linux-5.18.5-binderfs-as-module.patch | 62 +++++ patches/pipewire-0.3.52-upstreamfix.patch | 36 +++ .../xkeyboard-config-2.36-upstreamfix.patch | 41 ++++ source-urls | 61 ++--- stage1.sh | 6 +- utils/build-configs/kernel-config | 23 +- utils/builtins | 1 + 9 files changed, 326 insertions(+), 156 deletions(-) create mode 100644 patches/linux-5.18.5-binderfs-as-module.patch create mode 100644 patches/pipewire-0.3.52-upstreamfix.patch create mode 100644 patches/xkeyboard-config-2.36-upstreamfix.patch diff --git a/build-system.sh b/build-system.sh index 10ec3a3..ce48274 100755 --- a/build-system.sh +++ b/build-system.sh @@ -284,14 +284,14 @@ install -t /usr/share/licenses/m4 -Dm644 COPYING cd .. rm -rf m4-1.4.19 # bc. -tar -xf bc-5.2.5.tar.xz -cd bc-5.2.5 +tar -xf bc-5.3.3.tar.xz +cd bc-5.3.3 CC=gcc ./configure.sh --prefix=/usr --disable-generated-tests make make install install -t /usr/share/licenses/bc -Dm644 LICENSE.md cd .. -rm -rf bc-5.2.5 +rm -rf bc-5.3.3 # Flex. tar -xf flex-2.6.4.tar.gz cd flex-2.6.4 @@ -1104,10 +1104,9 @@ install -t /usr/share/licenses/iproute2 -Dm644 COPYING cd .. rm -rf iproute2-5.18.0 # Kbd. -tar -xf kbd-2.5.0.tar.xz -cd kbd-2.5.0 +tar -xf kbd-2.5.1.tar.xz +cd kbd-2.5.1 patch -Np1 -i ../patches/kbd-2.4.0-backspace-1.patch -sed -i 's/euro2/euro2.map/' data/keymaps/i386/qwerty/pt-latin1.map sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in ./configure --prefix=/usr @@ -1115,7 +1114,7 @@ make make install install -t /usr/share/licenses/kbd -Dm644 COPYING cd .. -rm -rf kbd-2.5.0 +rm -rf kbd-2.5.1 # libpipeline. tar -xf libpipeline-1.5.6.tar.gz cd libpipeline-1.5.6 @@ -1251,7 +1250,7 @@ cd smartypants.py-2.0.1 python setup.py install --optimize=1 install -t /usr/share/licenses/smartypants -Dm644 COPYING cd .. -rm -rf smartypants.py-2.0.1.tar.gz +rm -rf smartypants.py-2.0.1 # typogrify. tar -xf typogrify-2.0.7.tar.gz cd typogrify-2.0.7 @@ -1445,6 +1444,16 @@ make install ln -sf zlib /usr/share/licenses/minizip cd ../../.. rm -rf zlib-1.2.12 +# libmicrodns. +tar -xf microdns-0.2.0.tar.xz +cd microdns-0.2.0 +mkdir mdns-build; cd mdns-build +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dtests=disabled .. +ninja +ninja install +install -t /usr/share/licenses/libmicrodns -Dm644 ../COPYING +cd ../.. +rm -rf microdns-0.2.0 # sgml-common. tar -xf sgml-common-0.6.3.tgz cd sgml-common-0.6.3 @@ -2108,9 +2117,8 @@ install -t /usr/share/licenses/ntfs-3g -Dm644 COPYING COPYING.LIB cd .. rm -rf ntfs-3g-2022.5.17 # exfatprogs. -tar -xf exfatprogs_1.1.3.orig.tar.xz +tar -xf exfatprogs-1.1.3.tar.xz cd exfatprogs-1.1.3 -autoreconf -fi ./configure --prefix=/usr make make install @@ -2905,7 +2913,7 @@ mv /usr/share/dwarves/runtime/python/ostra.py /usr/lib/python3.10/ostra.py rm -rf /usr/share/dwarves/runtime/python install -t /usr/share/licenses/pahole -Dm644 ../COPYING cd ../.. -rm -rf pahole-1.23.tar.xz +rm -rf pahole-1.23 # DKMS. tar -xf dkms-3.0.3.tar.gz make -C dkms-3.0.3 BASHDIR=/usr/share/bash-completion/completions install @@ -3018,13 +3026,13 @@ install -t /usr/share/licenses/autoconf213 -Dm644 COPYING cd .. rm -rf autoconf-2.13 # LLVM/Clang/LLD. -tar -xf llvm-14.0.4.src.tar.xz +tar -xf llvm-14.0.5.src.tar.xz mkdir -p libunwind -tar -xf libunwind-14.0.4.src.tar.xz -C libunwind --strip-components=1 -cd llvm-14.0.4.src +tar -xf libunwind-14.0.5.src.tar.xz -C libunwind --strip-components=1 +cd llvm-14.0.5.src mkdir -p tools/{clang,lld} -tar -xf ../clang-14.0.4.src.tar.xz -C tools/clang --strip-components=1 -tar -xf ../lld-14.0.4.src.tar.xz -C tools/lld --strip-components=1 +tar -xf ../clang-14.0.5.src.tar.xz -C tools/clang --strip-components=1 +tar -xf ../lld-14.0.5.src.tar.xz -C tools/lld --strip-components=1 mkdir LLVM-build; cd LLVM-build CFLAGS="$CFLAGS -flarge-source-files" CXXFLAGS="$CXXFLAGS -flarge-source-files" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=MinSizeRel -DLLVM_HOST_TRIPLE=x86_64-pc-linux-gnu -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_FFI=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_TARGETS_TO_BUILD="AMDGPU;BPF;X86" -DLLVM_BINUTILS_INCDIR=/usr/include -Wno-dev -G Ninja .. ninja -j$(nproc) @@ -3033,19 +3041,18 @@ install -t /usr/share/licenses/llvm -Dm644 ../LICENSE.TXT ln -sf llvm /usr/share/licenses/clang ln -sf llvm /usr/share/licenses/lld cd ../.. -rm -rf libunwind -rm -rf llvm-14.0.4.src +rm -rf cmake libunwind llvm-14.0.5.src # Rust (will be uninstalled later). -tar -xf rust-1.58.1-x86_64-unknown-linux-gnu.tar.gz -cd rust-1.58.1-x86_64-unknown-linux-gnu +tar -xf rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz +cd rust-1.61.0-x86_64-unknown-linux-gnu ./install.sh --prefix=/usr --sysconfdir=/etc --without=rust-docs cd .. -rm -rf rust-1.58.1-x86_64-unknown-linux-gnu +rm -rf rust-1.61.0-x86_64-unknown-linux-gnu # JS91. tar -xf firefox-91.10.0esr.source.tar.xz cd firefox-91.10.0 +chmod +x js/src/configure.in mkdir JS91-build; cd JS91-build -chmod +x ../js/src/configure.in SHELL=/bin/sh ../js/src/configure.in --prefix=/usr --enable-linker=lld --with-intl-api --with-system-zlib --with-system-icu --disable-jemalloc --disable-debug-symbols --enable-readline make make install @@ -3055,8 +3062,8 @@ install -t /usr/share/licenses/js91 -Dm644 ../../extra-package-licenses/js91-lic cd ../.. rm -rf firefox-91.10.0 # Sudo. -tar -xf sudo-1.9.11p1.tar.gz -cd sudo-1.9.11p1 +tar -xf sudo-1.9.11p2.tar.gz +cd sudo-1.9.11p2 ./configure --prefix=/usr --libexecdir=/usr/lib --disable-pie --with-linux-audit --with-secure-path --with-insults --with-all-insults --with-passwd-tries=5 --with-env-editor --with-passprompt="[sudo] password for %p: " make make install @@ -3075,7 +3082,7 @@ session include system-session END install -t /usr/share/licenses/sudo -Dm644 LICENSE.md cd .. -rm -rf sudo-1.9.11p1 +rm -rf sudo-1.9.11p2 # volume-key. tar -xf volume_key-0.3.12.tar.gz cd volume_key-volume_key-0.3.12 @@ -3622,8 +3629,8 @@ install -t /usr/share/licenses/slang -Dm644 COPYING cd .. rm -rf slang-pre2.3.3-66 # BIND Utils. -tar -xf bind-9.18.3.tar.xz -cd bind-9.18.3 +tar -xf bind-9.18.4.tar.xz +cd bind-9.18.4 ./configure --prefix=/usr --with-json-c --with-libidn2 --with-libxml2 --with-lmdb --with-openssl make -C lib/isc make -C lib/dns @@ -3643,7 +3650,7 @@ make -C bin/dig install install -Dm644 doc/man/{dig.1,host.1,nslookup.1} /usr/share/man/man1 install -t /usr/share/licenses/bind-utils -Dm644 COPYRIGHT LICENSE cd .. -rm -rf bind-9.18.3 +rm -rf bind-9.18.4 # dhclient. tar -xf dhcp-4.4.3.tar.gz cd dhcp-4.4.3 @@ -3809,13 +3816,13 @@ install -t /usr/share/licenses/libxdmcp -Dm644 COPYING cd .. rm -rf libXdmcp-1.1.3 # xcb-proto. -tar -xf xcb-proto-1.15.tar.xz -cd xcb-proto-1.15 +tar -xf xcb-proto-1.15.2.tar.xz +cd xcb-proto-1.15.2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make install install -t /usr/share/licenses/xcb-proto -Dm644 COPYING cd .. -rm -rf xcb-proto-1.15 +rm -rf xcb-proto-1.15.2 # libxcb. tar -xf libxcb-1.15.tar.xz cd libxcb-1.15 @@ -3826,13 +3833,12 @@ install -t /usr/share/licenses/libxcb -Dm644 COPYING cd .. rm -rf libxcb-1.15 # Xorg Libraries. -for i in xtrans-1.4.0 libX11-1.8 libXext-1.3.4 libFS-1.0.8 libICE-1.0.10 libSM-1.2.3 libXScrnSaver-1.2.3 libXt-1.2.1 libXmu-1.1.3 libXpm-3.5.13 libXaw-1.0.14 libXfixes-6.0.0 libXcomposite-0.4.5 libXrender-0.9.10 libXcursor-1.2.1 libXdamage-1.1.5 libfontenc-1.1.4 libXfont2-2.0.5 libXft-2.3.4 libXi-1.8 libXinerama-1.1.4 libXrandr-1.5.2 libXres-1.2.1 libXtst-1.2.3 libXv-1.0.11 libXvMC-1.0.13 libXxf86dga-1.1.5 libXxf86vm-1.1.4 libdmx-1.1.4 libpciaccess-0.16 libxkbfile-1.1.0 libxshmfence-1.3; do +for i in xtrans-1.4.0 libX11-1.8.1 libXext-1.3.4 libFS-1.0.8 libICE-1.0.10 libSM-1.2.3 libXScrnSaver-1.2.3 libXt-1.2.1 libXmu-1.1.3 libXpm-3.5.13 libXaw-1.0.14 libXfixes-6.0.0 libXcomposite-0.4.5 libXrender-0.9.10 libXcursor-1.2.1 libXdamage-1.1.5 libfontenc-1.1.4 libXfont2-2.0.5 libXft-2.3.4 libXi-1.8 libXinerama-1.1.4 libXrandr-1.5.2 libXres-1.2.1 libXtst-1.2.3 libXv-1.0.11 libXvMC-1.0.13 libXxf86dga-1.1.5 libXxf86vm-1.1.4 libdmx-1.1.4 libpciaccess-0.16 libxkbfile-1.1.0 libxshmfence-1.3; do tar -xf $i.tar.* cd $i case $i in - libX11*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --disable-thread-safety-constructor ;; - libICE*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static ICE_LIBS=-lpthread ;; - libXt-[0-9]*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-appdefaultdir=/etc/X11/app-defaults ;; + libX11-*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --disable-thread-safety-constructor ;; + libXt-*) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-appdefaultdir=/etc/X11/app-defaults ;; *) ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static esac make @@ -3902,35 +3908,35 @@ install -t /usr/share/licenses/glslang -Dm644 LICENSE.txt cd .. rm -rf glslang-11.10.0 # Vulkan-Headers. -tar -xf Vulkan-Headers-1.3.213.tar.gz -cd Vulkan-Headers-1.3.213 +tar -xf Vulkan-Headers-1.3.217.tar.gz +cd Vulkan-Headers-1.3.217 mkdir VH-build; cd VH-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/vulkan-headers -Dm644 ../LICENSE.txt cd ../.. -rm -rf Vulkan-Headers-1.3.213 +rm -rf Vulkan-Headers-1.3.217 # Vulkan-Loader. -tar -xf Vulkan-Loader-1.3.213.tar.gz -cd Vulkan-Loader-1.3.213 +tar -xf Vulkan-Loader-1.3.217.tar.gz +cd Vulkan-Loader-1.3.217 mkdir VL-build; cd VL-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DVULKAN_HEADERS_INSTALL_DIR=/usr -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_DATADIR=/share -DCMAKE_SKIP_RPATH=TRUE -DBUILD_TESTS=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/vulkan-loader -Dm644 ../LICENSE.txt cd ../.. -rm -rf Vulkan-Loader-1.3.213 +rm -rf Vulkan-Loader-1.3.217 # Vulkan-Tools. -tar -xf Vulkan-Tools-1.3.213.tar.gz -cd Vulkan-Tools-1.3.213 +tar -xf Vulkan-Tools-1.3.217.tar.gz +cd Vulkan-Tools-1.3.217 mkdir VT-build; cd VT-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DGLSLANG_INSTALL_DIR=/usr -DCMAKE_SKIP_RPATH=TRUE -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_WAYLAND_SUPPORT=ON -DBUILD_CUBE=ON -DBUILD_ICD=OFF -DBUILD_VULKANINFO=ON -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/vulkan-tools -Dm644 ../LICENSE.txt cd ../.. -rm -rf Vulkan-Tools-1.3.213 +rm -rf Vulkan-Tools-1.3.217 # libva (circular dependency; will be rebuilt later to support Mesa). tar -xf libva-2.14.0.tar.bz2 cd libva-2.14.0 @@ -3962,15 +3968,15 @@ install -t /usr/share/licenses/libglvnd -Dm644 ../COPYING cd ../.. rm -rf libglvnd-v1.4.0 # Mesa. -tar -xf mesa-22.1.1.tar.xz -cd mesa-22.1.1 +tar -xf mesa-22.1.2.tar.xz +cd mesa-22.1.2 mkdir mesa-build; cd mesa-build meson --prefix=/usr --buildtype=release -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled .. ninja ninja install install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst cd ../.. -rm -rf mesa-22.1.1 +rm -rf mesa-22.1.2 # libva (rebuild to support Mesa). tar -xf libva-2.14.0.tar.bz2 cd libva-2.14.0 @@ -4029,6 +4035,7 @@ fc-cache # XKeyboard-Config. tar -xf xkeyboard-config-2.36.tar.xz cd xkeyboard-config-2.36 +patch -Np1 -i ../patches/xkeyboard-config-2.36-upstreamfix.patch mkdir XKeyboard-Config-BUILD; cd XKeyboard-Config-BUILD meson --prefix=/usr -Dcompat-rules=true -Dxkb-base=/usr/share/X11/xkb -Dxorg-rules-symlinks=true .. ninja @@ -4099,14 +4106,14 @@ install -t /usr/share/licenses/dbus-glib -Dm644 COPYING cd .. rm -rf dbus-glib-0.112 # alsa-lib. -tar -xf alsa-lib-1.2.7.tar.bz2 -cd alsa-lib-1.2.7 +tar -xf alsa-lib-1.2.7.1.tar.bz2 +cd alsa-lib-1.2.7.1 ./configure --prefix=/usr --without-debug make make install install -t /usr/share/licenses/alsa-lib -Dm644 COPYING cd .. -rm -rf alsa-lib-1.2.7 +rm -rf alsa-lib-1.2.7.1 # libepoxy. tar -xf libepoxy-1.5.10.tar.gz cd libepoxy-1.5.10 @@ -4172,15 +4179,15 @@ install -t /usr/share/licenses/xf86-input-evdev -Dm644 COPYING cd .. rm -rf xf86-input-evdev-2.10.6 # libinput. -tar -xf libinput-1.20.1.tar.bz2 -cd libinput-1.20.1 +tar -xf libinput-1.21.0.tar.bz2 +cd libinput-1.21.0 mkdir libinput-build; cd libinput-build meson --prefix=/usr --buildtype=release -Ddebug-gui=false -Dtests=false -Ddocumentation=false .. ninja ninja install install -t /usr/share/licenses/libinput -Dm644 ../COPYING cd ../.. -rm -rf libinput-1.20.1 +rm -rf libinput-1.21.0 # xf86-input-libinput. tar -xf xf86-input-libinput-1.2.1.tar.xz cd xf86-input-libinput-1.2.1 @@ -5378,8 +5385,8 @@ install -t /usr/share/licenses/ghostscript -Dm644 LICENSE cd .. rm -rf ghostscript-9.56.1 # MuPDF. -tar -xf mupdf-1.19.1-source.tar.gz -cd mupdf-1.19.1-source +tar -xf mupdf-1.20.0-source.tar.gz +cd mupdf-1.20.0-source sed -i '/MU.*_EXE. :/{ s/\(.(MUPDF_LIB)\)\(.*\)$/\2 | \1/ N @@ -5399,13 +5406,13 @@ USE_SYSTEM_GLUT := no USE_SYSTEM_CURL := yes USE_SYSTEM_GUMBO := no END -make prefix=/usr build=release shared=yes -make prefix=/usr build=release shared=yes install +make prefix=/usr build=small shared=yes +make prefix=/usr build=small shared=yes install chmod 755 /usr/lib/libmupdf.so ln -sf mupdf-gl /usr/bin/mupdf install -t /usr/share/licenses/mupdf -Dm644 COPYING cd .. -rm -rf mupdf-1.19.1-source +rm -rf mupdf-1.20.0-source # cups-filters. tar -xf cups-filters-1.28.15.tar.xz cd cups-filters-1.28.15 @@ -5647,8 +5654,8 @@ cat lib/Parse/Yapp.pm | tail -n14 | head -n12 > /usr/share/licenses/parse-yapp/C cd .. rm -rf Parse-Yapp-1.21 # smbclient (client portion of Samba). -tar -xf samba-4.16.1.tar.gz -cd samba-4.16.1 +tar -xf samba-4.16.2.tar.gz +cd samba-4.16.2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-pammodulesdir=/usr/lib/security --with-piddir=/run/samba --systemd-install-services --enable-fhs --without-pie --with-acl-support --with-ads --with-cluster-support --with-ldap --with-pam --with-profiling-data --with-systemd --with-winbind make mkdir -p /run/lock @@ -5671,7 +5678,7 @@ rm -f /usr/share/man/man8/{cifsdd,eventlogadm,idmap_ad,idmap_autorid,idmap_hash, rm -rf /var/cache/samba /var/lib/{ctdb,samba} /var/lock/samba /var/log/samba /var/run/{ctdb,samba} install -t /usr/share/licenses/smbclient -Dm644 COPYING VFS-License-clarification.txt cd .. -rm -rf samba-4.16.1 +rm -rf samba-4.16.2 # mobile-broadband-provider-info. tar -xf mobile-broadband-provider-info-20220511.tar.bz2 cd mobile-broadband-provider-info-20220511 @@ -5722,8 +5729,8 @@ systemctl enable upower cd ../.. rm -rf upower-v0.99.19 # NetworkManager. -tar -xf NetworkManager-1.38.0.tar.xz -cd NetworkManager-1.38.0 +tar -xf NetworkManager-1.38.2.tar.xz +cd NetworkManager-1.38.2 mkdir nm-build; cd nm-build meson --prefix=/usr --buildtype=release -Dnmtui=true -Dqt=false -Dselinux=false -Dsession_tracking=systemd -Dtests=no .. ninja @@ -5754,17 +5761,17 @@ END install -t /usr/share/licenses/networkmanager -Dm644 ../COPYING ../COPYING.GFDL ../COPYING.LGPL systemctl enable NetworkManager cd ../.. -rm -rf NetworkManager-1.38.0 +rm -rf NetworkManager-1.38.2 # libnma. -tar -xf libnma-1.8.38.tar.xz -cd libnma-1.8.38 +tar -xf libnma-1.8.40.tar.xz +cd libnma-1.8.40 mkdir nma-build; cd nma-build meson --prefix=/usr --buildtype=release .. ninja ninja install install -t /usr/share/licenses/libnma -Dm644 ../COPYING ../COPYING.LGPL cd ../.. -rm -rf libnma-1.8.38 +rm -rf libnma-1.8.40 # libnotify. tar -xf libnotify-0.7.12.tar.xz cd libnotify-0.7.12 @@ -6283,78 +6290,79 @@ install -t /usr/share/licenses/openal -Dm644 ../COPYING ../BSD-3Clause cd ../.. rm -rf openal-soft-1.21.1 # GStreamer. -tar -xf gstreamer-1.20.2.tar.xz -cd gstreamer-1.20.2 +tar -xf gstreamer-1.20.3.tar.xz +cd gstreamer-1.20.3 mkdir gstreamer-build; cd gstreamer-build -meson --prefix=/usr --buildtype=release -Dgst_debug=false -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dbenchmarks=disabled -Dexamples=disabled -Dgst_debug=false -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gstreamer -Dm644 ../COPYING cd ../.. -rm -rf gstreamer-1.20.2 +rm -rf gstreamer-1.20.3 # gst-plugins-base. -tar -xf gst-plugins-base-1.20.2.tar.xz -cd gst-plugins-base-1.20.2 +tar -xf gst-plugins-base-1.20.3.tar.xz +cd gst-plugins-base-1.20.3 mkdir base-build; cd base-build -meson --prefix=/usr --buildtype=release -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-base -Dm644 ../COPYING cd ../.. -rm -rf gst-plugins-base-1.20.2 +rm -rf gst-plugins-base-1.20.3 # gst-plugins-good. -tar -xf gst-plugins-good-1.20.2.tar.xz -cd gst-plugins-good-1.20.2 +tar -xf gst-plugins-good-1.20.3.tar.xz +cd gst-plugins-good-1.20.3 mkdir good-build; cd good-build -meson --prefix=/usr --buildtype=release -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-good -Dm644 ../COPYING cd ../.. -rm -rf gst-plugins-good-1.20.2 +rm -rf gst-plugins-good-1.20.3 # gst-plugins-bad. -tar -xf gst-plugins-bad-1.20.2.tar.xz -cd gst-plugins-bad-1.20.2 +tar -xf gst-plugins-bad-1.20.3.tar.xz +cd gst-plugins-bad-1.20.3 mkdir bad-build; cd bad-build -meson --prefix=/usr --buildtype=release -Dgpl=enabled -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-bad -Dm644 ../COPYING cd ../.. -rm -rf gst-plugins-bad-1.20.2 +rm -rf gst-plugins-bad-1.20.3 # gst-plugins-ugly. -tar -xf gst-plugins-ugly-1.20.2.tar.xz -cd gst-plugins-ugly-1.20.2 +tar -xf gst-plugins-ugly-1.20.3.tar.xz +cd gst-plugins-ugly-1.20.3 mkdir ugly-build; cd ugly-build -meson --prefix=/usr --buildtype=release -Dgpl=enabled -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-ugly -Dm644 ../COPYING cd ../.. -rm -rf gst-plugins-ugly-1.20.2 +rm -rf gst-plugins-ugly-1.20.3 # gst-libav. -tar -xf gst-libav-1.20.2.tar.xz -cd gst-libav-1.20.2 +tar -xf gst-libav-1.20.3.tar.xz +cd gst-libav-1.20.3 mkdir gst-libav-build; cd gst-libav-build -meson --prefix=/usr --buildtype=release -Dpackage-name="GStreamer 1.20.2 (MassOS)" -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-libav -Dm644 ../COPYING cd ../.. -rm -rf gst-libav-1.20.2 +rm -rf gst-libav-1.20.3 # gstreamer-vaapi. -tar -xf gstreamer-vaapi-1.20.2.tar.xz -cd gstreamer-vaapi-1.20.2 +tar -xf gstreamer-vaapi-1.20.3.tar.xz +cd gstreamer-vaapi-1.20.3 mkdir gstreamer-vaapi-build; cd gstreamer-vaapi-build -meson --prefix=/usr --buildtype=release -Dpackage-origin="https://massos.org" .. +meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gstreamer-vaapi -Dm644 ../COPYING.LIB cd ../.. -rm -rf gstreamer-vaapi-1.20.2 +rm -rf gstreamer-vaapi-1.20.3 # PipeWire + WirePlumber. tar -xf pipewire-0.3.52.tar.gz cd pipewire-0.3.52 +patch -Np1 -i ../patches/pipewire-0.3.52-upstreamfix.patch mkdir -p subprojects/wireplumber tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1 mkdir pipewire-build; cd pipewire-build @@ -7075,8 +7083,9 @@ install -t /usr/share/licenses/busybox -Dm644 LICENSE cd .. rm -rf busybox-1.35.0 # Linux Kernel. -tar -xf linux-5.18.3.tar.xz -cd linux-5.18.3 +tar -xf linux-5.18.5.tar.xz +cd linux-5.18.5 +patch -Np1 -i ../patches/linux-5.18.5-binderfs-as-module.patch cp ../kernel-config .config make olddefconfig make @@ -7089,30 +7098,30 @@ cp .config /boot/config-$KREL rm -f /usr/lib/modules/$KREL/{source,build} echo $KREL > version builddir=/usr/lib/modules/$KREL/build -install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map version vmlinux -install -Dt "$builddir/kernel" -m644 kernel/Makefile -install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile +install -t "$builddir" -Dm644 .config Makefile Module.symvers System.map version vmlinux +install -t "$builddir/kernel" -Dm644 kernel/Makefile +install -t "$builddir/arch/x86" -Dm644 arch/x86/Makefile cp -t "$builddir" -a scripts install -Dt "$builddir/tools/objtool" tools/objtool/objtool mkdir -p "$builddir"/{fs/xfs,mm} cp -t "$builddir" -a include cp -t "$builddir/arch/x86" -a arch/x86/include -install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s -install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h -install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h -install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h -install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h -install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h -install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h -install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h -find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \; +install -t "$builddir/arch/x86/kernel" -Dm644 arch/x86/kernel/asm-offsets.s +install -t "$builddir/drivers/md" -Dm644 drivers/md/*.h +install -t "$builddir/net/mac80211" -Dm644 net/mac80211/*.h +install -t "$builddir/drivers/media/i2c" -Dm644 drivers/media/i2c/msp3400-driver.h +install -t "$builddir/drivers/media/usb/dvb-usb" -Dm644 drivers/media/usb/dvb-usb/*.h +install -t "$builddir/drivers/media/dvb-frontends" -Dm644 drivers/media/dvb-frontends/*.h +install -t "$builddir/drivers/media/tuners" -Dm644 drivers/media/tuners/*.h +install -t "$builddir/drivers/iio/common/hid-sensors" -Dm644 drivers/iio/common/hid-sensors/*.h +find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" ';' rm -rf "$builddir/Documentation" find -L "$builddir" -type l -delete find "$builddir" -type f -name '*.o' -delete ln -sr "$builddir" "/usr/src/linux" install -t /usr/share/licenses/linux -Dm644 COPYING LICENSES/exceptions/* LICENSES/preferred/* cd .. -rm -rf linux-5.18.3 +rm -rf linux-5.18.5 unset builddir # NVIDIA Open kernel modules. tar -xf open-gpu-kernel-modules-515.43.04.tar.gz diff --git a/changelog.md b/changelog.md index bc1044b..6978ccc 100644 --- a/changelog.md +++ b/changelog.md @@ -4,11 +4,14 @@ This document contains the full changelog for every previous versions of MassOS, # Current Development Changes: +- Fixed an issue setting the default locale in the MassOS Installer (https://github.com/MassOS-Linux/MassOS/issues/35). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. Upgraded software: -- alsa-lib: `1.2.6.1 --> 1.2.7` +- alsa-lib: `1.2.6.1 --> 1.2.7.1` +- bc: `5.2.5 --> 5.3.3` +- BIND Utils: `9.18.3 --> 9.18.4` - btrfs-progs: `5.18 --> 5.18.1` - DirectX-Headers: `1.600.10 --> 1.602.0` - Exo: `4.17.1 --> 4.17.2` @@ -19,28 +22,38 @@ Upgraded software: - hwdata: `0.359 --> 0.360` - ISO-Codes: `4.9.0 --> 4.10.0` - JasPer: `3.0.3 --> 3.0.4` -- kbd: `2.4.0 --> 2.5.0` +- kbd: `2.4.0 --> 2.5.1` - libdrm: `2.4.110 --> 2.4.111` +- libinput: `1.20.1 --> 1.21.0` +- libnma: `1.8.38 --> 1.8.40` - libostree: `2022.3 --> 2022.4` - librsvg: `2.54.3 --> 2.54.4` -- Linux Kernel: `5.18.1 --> 5.18.3` +- libX11: `1.8 --> 1.8.1` +- Linux Kernel: `5.18.1 --> 5.18.5` +- LLVM/Clang/LLD: `14.0.4 --> 14.0.5` - lxml: `4.8.0 --> 4.9.0` -- Mesa: `22.1.0 --> 22.1.1` +- Mesa: `22.1.0 --> 22.1.2` - Meson: `0.62.1 --> 0.62.2` - mtools: `4.0.39 --> 4.0.40` +- MuPDF: `1.19.1 --> 1.20.0` - Nettle: `3.7.3 --> 3.8` - network-manager-applet: `1.26.0 --> 1.28.0` +- NetworkManager: `1.38.0 --> 1.38.2` - ntfs-3g: `2021.8.22 --> 2022.5.17` - PipeWire: `0.3.51 --> 0.3.52` - Poppler: `22.05.0 --> 22.06.0` - Python: `3.10.4 --> 3.10.5` +- smbclient: `4.16.1 --> 4.16.2` - SPIRV-Headers: `1.3.204.1 --> 1.3.216.0` -- Sudo: `1.9.10 --> 1.9.11p1` +- Sudo: `1.9.10 --> 1.9.11p2` - systemd: `251.1 --> 251.2` - Thunderbird: `91.9.1 --> 91.10.0` - UPower: `0.99.18 --> 0.99.19` +- Vulkan-Headers: `1.3.213 --> 1.3.217` +- Vulkan-Loader: `1.3.213 --> 1.3.217` - x264: `0.164.3094 --> 0.164.3095` - x265: `3.5-35-g7a5709048 --> 3.5-37-g9b59d4554` +- xcb-proto: `1.15 --> 1.15.2` - xfsprogs: `5.16.0 --> 5.18.0` - xkeyboard-config: `2.35.1 --> 2.36` diff --git a/patches/linux-5.18.5-binderfs-as-module.patch b/patches/linux-5.18.5-binderfs-as-module.patch new file mode 100644 index 0000000..891a344 --- /dev/null +++ b/patches/linux-5.18.5-binderfs-as-module.patch @@ -0,0 +1,62 @@ +From: Ben Hutchings +Date: Fri, 22 Jun 2018 17:27:00 +0100 +Subject: android: Enable building ashmem and binder as modules +Bug-Debian: https://bugs.debian.org/901492 + +We want to enable use of the Android ashmem and binder drivers to +support Anbox, but they should not be built-in as that would waste +resources and increase security attack surface on systems that don't +need them. + +- Add a MODULE_LICENSE declaration to ashmem +- Change the Makefiles to build each driver as an object with the + "_linux" suffix (which is what Anbox expects) +- Change config symbol types to tristate + +Update: +In upstream commit 721412ed3d titled "staging: remove ashmem" the ashmem +driver was removed entirely. Secondary commit message: +"The mainline replacement for ashmem is memfd, so remove the legacy +code from drivers/staging/" +Consequently, the ashmem part of this patch has been removed. +--- + drivers/android/Kconfig | 2 +- + drivers/android/Makefile | 7 ++++--- + drivers/android/binder_alloc.c | 2 +- + 3 files changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/android/Kconfig ++++ b/drivers/android/Kconfig +@@ -9,7 +9,7 @@ + if ANDROID + + config ANDROID_BINDER_IPC +- bool "Android Binder IPC Driver" ++ tristate "Android Binder IPC Driver" + depends on MMU + default n + help +--- a/drivers/android/Makefile ++++ b/drivers/android/Makefile +@@ -1,6 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0-only + ccflags-y += -I$(src) # needed for trace events + +-obj-$(CONFIG_ANDROID_BINDERFS) += binderfs.o +-obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o binder_alloc.o +-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o ++obj-$(CONFIG_ANDROID_BINDER_IPC) += binder_linux.o ++binder_linux-y := binder.o binder_alloc.o ++binder_linux-$(CONFIG_ANDROID_BINDERFS) += binderfs.o ++binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o +--- a/drivers/android/binder_alloc.c ++++ b/drivers/android/binder_alloc.c +@@ -38,7 +38,7 @@ + }; + static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR; + +-module_param_named(debug_mask, binder_alloc_debug_mask, ++module_param_named(alloc_debug_mask, binder_alloc_debug_mask, + uint, 0644); + + #define binder_alloc_debug(mask, x...) \ diff --git a/patches/pipewire-0.3.52-upstreamfix.patch b/patches/pipewire-0.3.52-upstreamfix.patch new file mode 100644 index 0000000..988c2db --- /dev/null +++ b/patches/pipewire-0.3.52-upstreamfix.patch @@ -0,0 +1,36 @@ +From 68bafcf166d98539dfda949f40c7438c1e4b2ec6 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Tue, 14 Jun 2022 11:18:52 +0200 +Subject: [PATCH] pulse-server: Don't send more than fragsize chunks + +Send exactly fragsize chunks when capturing. + +See #2418 and #2434 +--- + src/modules/module-protocol-pulse/pulse-server.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c +index f5e931969..85939229f 100644 +--- a/src/modules/module-protocol-pulse/pulse-server.c ++++ b/src/modules/module-protocol-pulse/pulse-server.c +@@ -87,9 +87,6 @@ + #define DEFAULT_POSITION "[ FL FR ]" + + #define MAX_FORMATS 32 +-/* The max amount of data we send in one block when capturing. In PulseAudio this +- * size is derived from the mempool PA_MEMPOOL_SLOT_SIZE */ +-#define MAX_FRAGSIZE (64*1024) + + #define TEMPORARY_MOVE_TIMEOUT (SPA_NSEC_PER_SEC) + +@@ -1326,8 +1323,7 @@ do_process_done(struct spa_loop *loop, + } + + while ((uint32_t)avail >= stream->attr.fragsize) { +- towrite = SPA_MIN(avail, MAX_FRAGSIZE); +- towrite = SPA_ROUND_DOWN(towrite, stream->frame_size); ++ towrite = SPA_MIN((uint32_t)avail, stream->attr.fragsize); + + msg = message_alloc(impl, stream->channel, towrite); + if (msg == NULL) diff --git a/patches/xkeyboard-config-2.36-upstreamfix.patch b/patches/xkeyboard-config-2.36-upstreamfix.patch new file mode 100644 index 0000000..cf1a9bf --- /dev/null +++ b/patches/xkeyboard-config-2.36-upstreamfix.patch @@ -0,0 +1,41 @@ +From dc1534b4b0cf2153e4b8848310efc8393fb73830 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Sun, 12 Jun 2022 12:05:20 +0200 +Subject: [PATCH] rules: remove two rules that reference two sections that were + deleted + +Commit fe36f31e8c from three months ago removed the need for special +aliases and key assignments for applealu_jis keyboards but forgot to +remove the two rules that reference these sections. + +This fixes issue #325. + +Signed-off-by: Benno Schulenberg +--- + rules/0004-evdev.m_k.part | 1 - + rules/0026-evdev.m_s.part | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.m_k.part +index 1cff7b2f..62c21ffc 100644 +--- a/rules/0004-evdev.m_k.part ++++ b/rules/0004-evdev.m_k.part +@@ -1,5 +1,4 @@ + ! model = keycodes +- applealu_jis = evdev+macintosh(jisevdev) + $jollamodels = evdev+jolla(jolla) + olpc = evdev+olpc(olpc) + olpcm = evdev+olpc(olpcm) +diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.m_s.part +index 2dd72051..80067025 100644 +--- a/rules/0026-evdev.m_s.part ++++ b/rules/0026-evdev.m_s.part +@@ -2,5 +2,4 @@ + $evdevkbds = +inet(evdev)+inet(%m) + chromebook = +inet(evdev)+inet(chromebook) + ppkb = +inet(evdev)+inet(ppkb) +- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) + * = +inet(evdev) +-- +GitLab + diff --git a/source-urls b/source-urls index 9374d0b..c482438 100644 --- a/source-urls +++ b/source-urls @@ -3,7 +3,7 @@ https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar https://de.freedif.org/savannah/acl/acl-2.3.1.tar.xz https://archive.massos.org/sources/acpi-1.7.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz -https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.tar.bz2 +https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.1.tar.bz2 https://launchpad.net/apparmor/3.0/3.0.4/+download/apparmor-3.0.4.tar.gz https://www.freedesktop.org/software/appstream/releases/AppStream-0.15.4.tar.xz https://github.com/hughsie/appstream-glib/archive/refs/tags/appstream_glib_0_7_18.tar.gz @@ -26,8 +26,8 @@ https://gitlab.com/sane-project/backends/-/archive/1.1.1/backends-1.1.1.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/baobab/41/baobab-41.0.tar.xz https://mirror.lyrahosting.com/gnu/bash/bash-5.1.16.tar.gz https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz -https://github.com/gavinhoward/bc/releases/download/5.2.5/bc-5.2.5.tar.xz -https://ftp.isc.org/isc/bind9/9.18.3/bind-9.18.3.tar.xz +https://github.com/gavinhoward/bc/releases/download/5.3.3/bc-5.3.3.tar.xz +https://ftp.isc.org/isc/bind9/9.18.4/bind-9.18.4.tar.xz https://mirror.lyrahosting.com/gnu/binutils/binutils-2.38.tar.xz https://mirror.lyrahosting.com/gnu/bison/bison-3.8.2.tar.xz https://github.com/blueman-project/blueman/releases/download/2.2.2/blueman-2.2.2.tar.xz @@ -47,7 +47,7 @@ https://deb.debian.org/debian/pool/main/c/cdrkit/cdrkit_1.1.11.orig.tar.gz https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz https://files.pythonhosted.org/packages/source/c/chardet/chardet-4.0.0.tar.gz https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/clang-14.0.4.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/clang-14.0.5.src.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter/1.26/clutter-1.26.4.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2.tar.gz @@ -104,7 +104,7 @@ https://github.com/rhboot/efivar/releases/download/38/efivar-38.tar.bz2 https://sourceware.org/ftp/elfutils/0.187/elfutils-0.187.tar.bz2 https://github.com/AbiWord/enchant/releases/download/v2.3.3/enchant-2.3.3.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/evince/42/evince-42.3.tar.xz -https://deb.debian.org/debian/pool/main/e/exfatprogs/exfatprogs_1.1.3.orig.tar.xz +https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz https://github.com/Exiv2/exiv2/releases/download/v0.27.5/exiv2-0.27.5-Source.tar.gz https://mirror.netcologne.de/xfce/src/xfce/exo/4.17/exo-4.17.2.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz @@ -169,13 +169,13 @@ https://mirror.lyrahosting.com/gnu/groff/groff-1.22.4.tar.gz https://mirror.lyrahosting.com/gnu/grub/grub-2.06.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/42/gsettings-desktop-schemas-42.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gspell/1.10/gspell-1.10.0.tar.xz -https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.2.tar.xz -https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.2.tar.xz +https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.3.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gtk-doc/1.33/gtk-doc-1.33.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.tar.xz https://gitlab.gnome.org/GNOME/gtk/-/archive/3.24.34/gtk-3.24.34.tar.bz2 @@ -213,7 +213,7 @@ https://www.cpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.06.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz https://github.com/open-source-parsers/jsoncpp/archive/1.9.5/jsoncpp-1.9.5.tar.gz -https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.5.0.tar.xz +https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.5.1.tar.xz https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://kerberos.org/dist/krb5/1.20/krb5-1.20.tar.gz @@ -268,7 +268,7 @@ https://mirror.lyrahosting.com/gnu/libidn/libidn2-2.3.2.tar.gz https://cdn.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2 https://github.com/benhoyt/inih/archive/r55/inih-r55.tar.gz -https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.20.1/libinput-1.20.1.tar.bz2 +https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.21.0/libinput-1.21.0.tar.bz2 https://files.libburnia-project.org/releases/libisoburn-1.5.4.tar.gz https://files.libburnia-project.org/releases/libisofs-1.5.4.tar.gz https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.3/libjpeg-turbo-2.1.3.tar.gz @@ -282,7 +282,7 @@ https://github.com/hoene/libmysofa/archive/v1.2.1/libmysofa-1.2.1.tar.gz https://mirror.lyrahosting.com/ubuntuarchive/ubuntu/pool/main/libn/libndp/libndp_1.8.orig.tar.gz https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz https://github.com/thom311/libnl/releases/download/libnl3_6_0/libnl-3.6.0.tar.gz -https://ftp.acc.umu.se/pub/gnome/sources/libnma/1.8/libnma-1.8.38.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/libnma/1.8/libnma-1.8.40.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/libnotify/0.7/libnotify-0.7.12.tar.xz https://github.com/thkukuk/libnsl/releases/download/v2.0.0/libnsl-2.0.0.tar.xz https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz @@ -320,7 +320,7 @@ https://mirror.lyrahosting.com/gnu/libtool/libtool-2.4.7.tar.xz https://github.com/stefanberger/libtpms/archive/v0.9.2/libtpms-0.9.2.tar.gz https://mirror.lyrahosting.com/gnu/libunistring/libunistring-1.0.tar.xz https://de.freedif.org/savannah/libunwind/libunwind-1.6.2.tar.gz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/libunwind-14.0.4.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/libunwind-14.0.5.src.tar.xz https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.1.tar.bz2 https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2 @@ -333,7 +333,7 @@ https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.2.0/libwacom https://github.com/webmproject/libwebp/archive/v1.2.2/libwebp-1.2.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/libwnck/40/libwnck-40.1.tar.xz https://wpewebkit.org/releases/libwpe-1.13.1.tar.xz -https://www.x.org/archive/individual/lib/libX11-1.8.tar.xz +https://www.x.org/archive/individual/lib/libX11-1.8.1.tar.xz https://www.x.org/archive/individual/lib/libXau-1.0.9.tar.bz2 https://www.x.org/archive/individual/lib/libXaw-1.0.14.tar.bz2 https://xorg.freedesktop.org/archive/individual/lib/libxcb-1.15.tar.xz @@ -372,10 +372,10 @@ https://www.x.org/archive/individual/lib/libXxf86vm-1.1.4.tar.bz2 https://libzip.org/download/libzip-1.8.0.tar.xz https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz -https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz +https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.5.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/lld-14.0.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.4/llvm-14.0.4.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/lld-14.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/llvm-14.0.5.src.tar.xz https://github.com/lm-sensors/lm-sensors/archive/V3-6-0/lm-sensors-3-6-0.tar.gz https://github.com/LMDB/lmdb/archive/LMDB_0.9.29.tar.gz https://www.cpan.org/authors/id/P/PV/PVANDRY/Locale-gettext-1.07.tar.gz @@ -403,9 +403,10 @@ https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.3.6.tar.gz https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-2.1.1.tar.gz https://github.com/MassOS-Linux/massos-welcome/archive/cc649f83e04f0daa880edf1df8e4d5165b79787c/massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c.tar.gz https://cdn.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz -https://archive.mesa3d.org/mesa-22.1.1.tar.xz +https://archive.mesa3d.org/mesa-22.1.2.tar.xz https://github.com/mesonbuild/meson/releases/download/0.62.2/meson-0.62.2.tar.gz https://www.x.org/archive/individual/app/mkfontscale-1.2.2.tar.xz +https://github.com/videolabs/libmicrodns/releases/download/0.2.0/microdns-0.2.0.tar.xz https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/20220511/mobile-broadband-provider-info-20220511.tar.bz2 https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.8.tar.xz https://deb.debian.org/debian/pool/main/m/moreutils/moreutils_0.67.orig.tar.gz @@ -417,7 +418,7 @@ https://mpg123.org/download/mpg123-1.29.3.tar.bz2 https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2 https://mirror.lyrahosting.com/gnu/mtools/mtools-4.0.40.tar.gz https://github.com/bluesabre/mugshot/releases/download/mugshot-0.4.3/mugshot-0.4.3.tar.gz -https://www.mupdf.com/downloads/archive/mupdf-1.19.1-source.tar.gz +https://www.mupdf.com/downloads/archive/mupdf-1.20.0-source.tar.gz https://nano-editor.org/dist/v6/nano-6.3.tar.xz https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz https://mirror.lyrahosting.com/gnu/ncurses/ncurses-6.3.tar.gz @@ -426,7 +427,7 @@ https://archive.massos.org/sources/net-snmp-5.9.1.tar.xz https://archive.massos.org/sources/netcat-0.7.1.tar.xz https://mirror.lyrahosting.com/gnu/nettle/nettle-3.8.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/network-manager-applet/1.28/network-manager-applet-1.28.0.tar.xz -https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager/1.38/NetworkManager-1.38.0.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager/1.38/NetworkManager-1.38.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.18.tar.xz https://releases.pagure.org/newt/newt-0.52.21.tar.gz https://github.com/nghttp2/nghttp2/releases/download/v1.47.0/nghttp2-1.47.0.tar.xz @@ -508,8 +509,8 @@ https://github.com/oetiker/rrdtool-1.x/releases/download/v1.7.2/rrdtool-1.7.2.ta https://www.samba.org/ftp/rsync/src/rsync-3.2.4.tar.gz https://archive.massos.org/sources/rtmpdump-2.4-20210219-gf1b83c1.tar.xz https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.xz -https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.16.1.tar.gz +https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.16.2.tar.gz https://github.com/sass/sassc/archive/3.6.2/sassc-3.6.2.tar.gz https://cdn.kernel.org/pub/linux/bluetooth/sbc-1.5.tar.xz https://www.libsdl.org/release/SDL-1.2.15.tar.gz @@ -542,7 +543,7 @@ https://archive.massos.org/sources/squashfs-tools-4.5.tar.xz https://github.com/vasi/squashfuse/releases/download/0.1.104/squashfuse-0.1.104.tar.gz https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.3/sshfs-3.7.3.tar.xz https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz -https://www.sudo.ws/sudo/dist/sudo-1.9.11p1.tar.gz +https://www.sudo.ws/sudo/dist/sudo-1.9.11p2.tar.gz https://archive.massos.org/sources/swig-4.0.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz @@ -580,9 +581,9 @@ https://deb.debian.org/debian/pool/main/v/vitetris/vitetris_0.59.1.orig.tar.gz https://github.com/Netflix/vmaf/archive/v2.3.0/vmaf-2.3.0.tar.gz https://github.com/felixonmars/volume_key/archive/volume_key-0.3.12.tar.gz https://gitlab.gnome.org/GNOME/vte/-/archive/0.68.0/vte-0.68.0.tar.bz2 -https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.213/Vulkan-Headers-1.3.213.tar.gz -https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.3.213/Vulkan-Loader-1.3.213.tar.gz -https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.3.213/Vulkan-Tools-1.3.213.tar.gz +https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.217/Vulkan-Headers-1.3.217.tar.gz +https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.3.217/Vulkan-Loader-1.3.217.tar.gz +https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.3.217/Vulkan-Tools-1.3.217.tar.gz https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz https://webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz @@ -601,7 +602,7 @@ https://github.com/ib/xarchiver/archive/0.5.4.17/xarchiver-0.5.4.17.tar.gz https://www.x.org/archive/individual/app/xauth-1.1.2.tar.xz https://www.x.org/archive/individual/app/xbacklight-1.2.3.tar.bz2 https://www.x.org/archive/individual/data/xbitmaps-1.1.2.tar.bz2 -https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-1.15.tar.xz +https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-1.15.2.tar.xz https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 diff --git a/stage1.sh b/stage1.sh index d2d902c..48f6ff9 100755 --- a/stage1.sh +++ b/stage1.sh @@ -72,14 +72,14 @@ cat gcc/limitx.h gcc/glimits.h gcc/limity.h > `dirname $($MASSOS_TARGET-gcc -pri cd .. rm -rf gcc-12.1.0 # Linux API Headers. -tar -xf linux-5.18.3.tar.xz -cd linux-5.18.3 +tar -xf linux-5.18.5.tar.xz +cd linux-5.18.5 make headers find usr/include -name '.*' -delete rm usr/include/Makefile cp -r usr/include "$MASSOS"/usr cd .. -rm -rf linux-5.18.3 +rm -rf linux-5.18.5 # Glibc tar -xf glibc-2.35.tar.xz cd glibc-2.35 diff --git a/utils/build-configs/kernel-config b/utils/build-configs/kernel-config index 5cdf5c0..a51de82 100644 --- a/utils/build-configs/kernel-config +++ b/utils/build-configs/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (MassOS GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -5105,9 +5105,6 @@ CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m CONFIG_SENSORS_NZXT_SMART2=m CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_PECI_CPUTEMP=m -CONFIG_SENSORS_PECI_DIMMTEMP=m -CONFIG_SENSORS_PECI=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1266=m @@ -9787,7 +9784,7 @@ CONFIG_USB4=m # Android # CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_BINDER_IPC=m CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ANDROID_BINDER_IPC_SELFTEST=y @@ -9882,8 +9879,7 @@ CONFIG_MOST=m CONFIG_MOST_USB_HDM=m CONFIG_MOST_CDEV=m CONFIG_MOST_SND=m -CONFIG_PECI=m -CONFIG_PECI_CPU=m +# CONFIG_PECI is not set # end of Device Drivers # @@ -10345,8 +10341,18 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set CONFIG_SECURITY_LANDLOCK=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_PLATFORM_KEYRING=y +CONFIG_INTEGRITY_MACHINE_KEYRING=y +CONFIG_LOAD_UEFI_KEYS=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set @@ -10760,6 +10766,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y +CONFIG_SIGNATURE=y CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y diff --git a/utils/builtins b/utils/builtins index 239722d..77c0c84 100644 --- a/utils/builtins +++ b/utils/builtins @@ -260,6 +260,7 @@ libjpeg-turbo libksba libmbim libmetalink +libmicrodns libmodplug libmpeg2 libmtp From c30c0e92c96dbf0b2fda8befcaa688bb234672d4 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 18 Jun 2022 13:18:28 +0100 Subject: [PATCH 16/32] Replace dhclient with dhcpcd dhclient is deprecated upstream, and future ISC DHCP releases won't include it. https://www.isc.org/blogs/dhcp-client-relay-eom/ --- build-system.sh | 58 ++++++++++++--------------- changelog.md | 1 + source-urls | 2 +- utils/builtins | 2 +- utils/systemd-units/dhclient@.service | 15 ------- utils/systemd-units/dhcpcd.service | 13 ++++++ utils/systemd-units/dhcpcd@.service | 13 ++++++ 7 files changed, 55 insertions(+), 49 deletions(-) delete mode 100644 utils/systemd-units/dhclient@.service create mode 100644 utils/systemd-units/dhcpcd.service create mode 100644 utils/systemd-units/dhcpcd@.service diff --git a/build-system.sh b/build-system.sh index ce48274..614179d 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3651,33 +3651,19 @@ install -Dm644 doc/man/{dig.1,host.1,nslookup.1} /usr/share/man/man1 install -t /usr/share/licenses/bind-utils -Dm644 COPYRIGHT LICENSE cd .. rm -rf bind-9.18.4 -# dhclient. -tar -xf dhcp-4.4.3.tar.gz -cd dhcp-4.4.3 -CFLAGS="$CFLAGS -fno-strict-aliasing -D_PATH_DHCLIENT_SCRIPT='\"/usr/sbin/dhclient-script\"' -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"' -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'" ./configure --prefix=/usr --sysconfdir=/etc/dhcp --localstatedir=/var --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases --with-cli-lease-file=/var/lib/dhclient/dhclient.leases --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases -make -make -C client install -install -m755 client/scripts/linux /usr/sbin/dhclient-script -install -dm755 /etc/dhcp -cat > /etc/dhcp/dhclient.conf << END -# Basic dhclient.conf(5) - -#prepend domain-name-servers 127.0.0.1; -request subnet-mask, broadcast-address, time-offset, routers, - domain-name, domain-name-servers, domain-search, host-name, - netbios-name-servers, netbios-scope, interface-mtu, - ntp-servers; -require subnet-mask, domain-name-servers; -#timeout 60; -#retry 60; -#reboot 10; -#select-timeout 5; -#initial-interval 2; -END -install -dm755 /var/lib/dhclient -install -t /usr/share/licenses/dhclient -Dm644 LICENSE +# dhcpcd. +tar -xf dhcpcd-9.4.1.tar.xz +cd dhcpcd-9.4.1 +groupadd -g 52 dhcpcd +useradd -c "dhcpcd PrivSep" -d /var/lib/dhcpcd -g dhcpcd -s /bin/false -u 52 dhcpcd +install -o dhcpcd -g dhcpcd -dm700 /var/lib/dhcpcd +./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/dhcpcd --runstatedir=/run --dbdir=/var/lib/dhcpcd --privsepuser=dhcpcd +make +make install +rm -f /usr/lib/dhcpcd/dhcpcd-hooks/30-hostname +install -t /usr/share/licenses/dhcpcd -Dm644 LICENSE cd .. -rm -rf dhcp-4.4.3 +rm -rf dhcpcd-9.4.1 # xdg-utils. tar -xf xdg-utils-1.1.3.tar.gz cd xdg-utils-1.1.3 @@ -5745,7 +5731,7 @@ auth-polkit=true END cat > /etc/NetworkManager/conf.d/dhcp.conf << END [main] -dhcp=dhclient +dhcp=dhcpcd END cat > /etc/NetworkManager/conf.d/dns.conf << END [main] @@ -6751,20 +6737,21 @@ rm -rf pavucontrol-5.0 tar -xf blueman-2.2.2.tar.xz cd blueman-2.2.2 sed -i '/^dbusdir =/ s/sysconfdir/datadir/' data/configs/Makefile.{am,in} -./configure --prefix=/usr --sysconfdir=/etc --with-dhcp-config='/etc/dhcp/dhclient.conf' +./configure --prefix=/usr --sysconfdir=/etc --with-dhcp-config=/etc/dhcp/dhcpd.conf make make install mv /etc/xdg/autostart/blueman.desktop /usr/share/blueman/autostart.desktop -cat > /sbin/blueman-autostart << "END" +cat > /usr/sbin/blueman-autostart << "END" #!/bin/bash not_root() { - echo "Error: $(basename $0) must be run as root." >&2 + echo "Error: $(basename "$0") must be run as root." >&2 exit 1 } usage() { - echo "Usage: $(basename $0) [enable|disable]" >&2 + echo "$(basename "$0"): Control whether Blueman will autostart on login." + echo "Usage: $(basename "$0") [enable|disable]" >&2 exit 1 } @@ -7207,7 +7194,14 @@ if ! grep -q nm-openvpn /etc/group; then groupadd -g 85 nm-openvpn useradd -c "NetworkManager OpenVPN" -d /dev/null -u 85 -g nm-openvpn -s /bin/false nm-openvpn fi -test ! -f /etc/dracut.conf.d/ostree.conf.new || mv /etc/dracut.conf.d/ostree.conf{.new,} +# Now using dhcpcd instead of dhclient (dhclient is deprecated upstream). +if ! grep -q dhcpcd /etc/group; then + goupadd -g 52 dhcpcd + useradd -c "dhcpcd PrivSep" -d /var/lib/dhcpcd -g dhcpcd -s /bin/false -u 52 dhcpcd +fi +if grep -q dhclient /etc/NetworkManager/conf.d/dhcp.conf; then + sed -i 's/dhclient/dhcpcd/' /etc/NetworkManager/conf.d/dhcp.conf +fi # hwdata package is now used instead of systemd timers. if grep -q hwdata /usr/share/massos/builtins; then systemctl disable update-pciids.timer || true diff --git a/changelog.md b/changelog.md index 6978ccc..6120eb0 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,7 @@ Changes: - Fixed an issue setting the default locale in the MassOS Installer (https://github.com/MassOS-Linux/MassOS/issues/35). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. +- Replaced dhclient with dhcpcd, as dhclient is now deprecated upstream. Upgraded software: diff --git a/source-urls b/source-urls index c482438..aa30748 100644 --- a/source-urls +++ b/source-urls @@ -72,7 +72,7 @@ https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.18.tar.gz https://clint.pages.debian.net/debianutils-tarballs/artifacts/debianutils-5.5.tar.gz https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz -https://ftp.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3.tar.gz +https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.4.1.tar.xz https://invisible-mirror.net/archives/dialog/dialog-1.3-20220526.tgz https://mirror.lyrahosting.com/gnu/diffutils/diffutils-3.8.tar.xz https://github.com/microsoft/DirectX-Headers/archive/v1.602.0/DirectX-Headers-1.602.0.tar.gz diff --git a/utils/builtins b/utils/builtins index 77c0c84..f80518d 100644 --- a/utils/builtins +++ b/utils/builtins @@ -66,7 +66,7 @@ dbus dbus-glib dbus-python desktop-file-utils -dhclient +dhcpcd dialog diffutils directx-headers diff --git a/utils/systemd-units/dhclient@.service b/utils/systemd-units/dhclient@.service deleted file mode 100644 index ae631db..0000000 --- a/utils/systemd-units/dhclient@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=ISC DHCP Client on %I -Wants=network.target -Before=network.target -BindsTo=sys-subsystem-net-devices-%i.device -After=sys-subsystem-net-devices-%i.device - -[Service] -Type=forking -PIDFile=/run/dhclient-%I.pid -ExecStart=/sbin/dhclient -pf /run/dhclient-%I.pid -lf /var/lib/dhclient/dhclient-%I.lease %I -ExecStop=/sbin/dhclient -r -pf /run/dhclient-%I.pid -lf /var/lib/dhclient/dhclient-%I.lease %I - -[Install] -WantedBy=multi-user.target diff --git a/utils/systemd-units/dhcpcd.service b/utils/systemd-units/dhcpcd.service new file mode 100644 index 0000000..8b44120 --- /dev/null +++ b/utils/systemd-units/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on all interfaces +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd/pid +ExecStart=/usr/sbin/dhcpcd -q -b +ExecStop=/usr/sbin/dhcpcd -x + +[Install] +WantedBy=multi-user.target diff --git a/utils/systemd-units/dhcpcd@.service b/utils/systemd-units/dhcpcd@.service new file mode 100644 index 0000000..8b44120 --- /dev/null +++ b/utils/systemd-units/dhcpcd@.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on all interfaces +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd/pid +ExecStart=/usr/sbin/dhcpcd -q -b +ExecStop=/usr/sbin/dhcpcd -x + +[Install] +WantedBy=multi-user.target From f1b1332f5bc28ca90b6bf93b90cf221f0e47fce6 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 18 Jun 2022 13:29:03 +0100 Subject: [PATCH 17/32] Fix source URL for ISO-Codes --- build-system.sh | 6 +++--- source-urls | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-system.sh b/build-system.sh index 614179d..5d32247 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3573,14 +3573,14 @@ install -t /usr/share/licenses/sassc -Dm644 LICENSE cd .. rm -rf sassc-3.6.2 # ISO-Codes. -tar -xf iso-codes_4.10.0.orig.tar.xz -cd iso-codes-4.10.0 +tar -xf iso-codes-v4.10.0.tar.bz2 +cd iso-codes-v4.10.0 ./configure --prefix=/usr make make install install -t /usr/share/licenses/iso-codes -Dm644 COPYING cd .. -rm -rf iso-codes-4.10.0 +rm -rf iso-codes-v4.10.0 # xdg-user-dirs. tar -xf xdg-user-dirs-0.17.tar.gz cd xdg-user-dirs-0.17 diff --git a/source-urls b/source-urls index aa30748..757d823 100644 --- a/source-urls +++ b/source-urls @@ -203,7 +203,7 @@ https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi- https://archive.massos.org/sources/intltool-0.51.0.tar.gz https://cdn.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.18.0.tar.xz https://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2 -https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.10.0.orig.tar.xz +https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.10.0/iso-codes-v4.10.0.tar.bz2 https://archive.massos.org/sources/itstool-2.0.7.tar.bz2 https://github.com/jackaudio/jack2/archive/v1.9.21/jack2-1.9.21.tar.gz https://digip.org/jansson/releases/jansson-2.13.1.tar.gz From 51c51518ce07ade0c913f7c7f2aa28531041b5e8 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sun, 19 Jun 2022 10:10:02 +0100 Subject: [PATCH 18/32] Revert; causes build issues --- build-system.sh | 1 - patches/linux-5.18.5-binderfs-as-module.patch | 62 ------------------- utils/build-configs/kernel-config | 2 +- 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 patches/linux-5.18.5-binderfs-as-module.patch diff --git a/build-system.sh b/build-system.sh index 5d32247..a46040c 100755 --- a/build-system.sh +++ b/build-system.sh @@ -7072,7 +7072,6 @@ rm -rf busybox-1.35.0 # Linux Kernel. tar -xf linux-5.18.5.tar.xz cd linux-5.18.5 -patch -Np1 -i ../patches/linux-5.18.5-binderfs-as-module.patch cp ../kernel-config .config make olddefconfig make diff --git a/patches/linux-5.18.5-binderfs-as-module.patch b/patches/linux-5.18.5-binderfs-as-module.patch deleted file mode 100644 index 891a344..0000000 --- a/patches/linux-5.18.5-binderfs-as-module.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Ben Hutchings -Date: Fri, 22 Jun 2018 17:27:00 +0100 -Subject: android: Enable building ashmem and binder as modules -Bug-Debian: https://bugs.debian.org/901492 - -We want to enable use of the Android ashmem and binder drivers to -support Anbox, but they should not be built-in as that would waste -resources and increase security attack surface on systems that don't -need them. - -- Add a MODULE_LICENSE declaration to ashmem -- Change the Makefiles to build each driver as an object with the - "_linux" suffix (which is what Anbox expects) -- Change config symbol types to tristate - -Update: -In upstream commit 721412ed3d titled "staging: remove ashmem" the ashmem -driver was removed entirely. Secondary commit message: -"The mainline replacement for ashmem is memfd, so remove the legacy -code from drivers/staging/" -Consequently, the ashmem part of this patch has been removed. ---- - drivers/android/Kconfig | 2 +- - drivers/android/Makefile | 7 ++++--- - drivers/android/binder_alloc.c | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) - ---- a/drivers/android/Kconfig -+++ b/drivers/android/Kconfig -@@ -9,7 +9,7 @@ - if ANDROID - - config ANDROID_BINDER_IPC -- bool "Android Binder IPC Driver" -+ tristate "Android Binder IPC Driver" - depends on MMU - default n - help ---- a/drivers/android/Makefile -+++ b/drivers/android/Makefile -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0-only - ccflags-y += -I$(src) # needed for trace events - --obj-$(CONFIG_ANDROID_BINDERFS) += binderfs.o --obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o binder_alloc.o --obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o -+obj-$(CONFIG_ANDROID_BINDER_IPC) += binder_linux.o -+binder_linux-y := binder.o binder_alloc.o -+binder_linux-$(CONFIG_ANDROID_BINDERFS) += binderfs.o -+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o ---- a/drivers/android/binder_alloc.c -+++ b/drivers/android/binder_alloc.c -@@ -38,7 +38,7 @@ - }; - static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR; - --module_param_named(debug_mask, binder_alloc_debug_mask, -+module_param_named(alloc_debug_mask, binder_alloc_debug_mask, - uint, 0644); - - #define binder_alloc_debug(mask, x...) \ diff --git a/utils/build-configs/kernel-config b/utils/build-configs/kernel-config index a51de82..b86d9d3 100644 --- a/utils/build-configs/kernel-config +++ b/utils/build-configs/kernel-config @@ -9784,7 +9784,7 @@ CONFIG_USB4=m # Android # CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=m +CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ANDROID_BINDER_IPC_SELFTEST=y From 398ad81d7b659aebd6fc466d7d2ccf7ef65b87a6 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sun, 19 Jun 2022 12:09:38 +0100 Subject: [PATCH 19/32] Set Meson buildtype to minsize --- build-system.sh | 208 ++++++++++++++++++++++++------------------------ 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/build-system.sh b/build-system.sh index a46040c..68113ac 100755 --- a/build-system.sh +++ b/build-system.sh @@ -1282,7 +1282,7 @@ rm -rf Markdown-3.3.6 tar -xf gi-docgen-2022.1.tar.xz cd gi-docgen-2022.1 mkdir gi-docgen-build; cd gi-docgen-build -meson --prefix=/usr --buildtype=release -Ddevelopment_tests=false .. +meson --prefix=/usr --buildtype=minsize -Ddevelopment_tests=false .. ninja ninja install install -t /usr/share/licenses/gi-docgen -Dm644 ../LICENSES/{Apache-2.0.txt,GPL-3.0-or-later.txt} @@ -1448,7 +1448,7 @@ rm -rf zlib-1.2.12 tar -xf microdns-0.2.0.tar.xz cd microdns-0.2.0 mkdir mdns-build; cd mdns-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dexamples=disabled -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/libmicrodns -Dm644 ../COPYING @@ -1843,7 +1843,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=false -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=false .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=minsize -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=false -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=false .. ninja ninja install systemd-machine-id-setup @@ -1927,7 +1927,7 @@ tar -xf fuse-3.11.0.tar.xz cd fuse-3.11.0 sed -i '/^udev/,$ s/^/#/' util/meson.build mkdir fuse3-build; cd fuse3-build -meson --prefix=/usr --buildtype=release -Dexamples=false -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dexamples=false -Dtests=false .. ninja ninja install chmod u+s /usr/bin/fusermount3 @@ -2081,7 +2081,7 @@ rm -rf btrfs-progs-v5.18.1 tar -xf inih-r55.tar.gz cd inih-r55 mkdir inih-build; cd inih-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/inih -Dm644 ../LICENSE.txt @@ -2246,7 +2246,7 @@ rm -rf curl-7.83.1 tar -xf jsoncpp-1.9.5.tar.gz cd jsoncpp-1.9.5 mkdir jsoncpp-build; cd jsoncpp-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/jsoncpp -Dm644 ../LICENSE @@ -2468,7 +2468,7 @@ cat >> trust/trust-extract-compat << END /usr/sbin/make-ca -f -g END mkdir p11-build; cd p11-build -meson --prefix=/usr --buildtype=release -Dtrust_paths=/etc/pki/anchors .. +meson --prefix=/usr --buildtype=minsize -Dtrust_paths=/etc/pki/anchors .. ninja ninja install ln -sf /usr/libexec/p11-kit/trust-extract-compat /usr/bin/update-ca-certificates @@ -2924,7 +2924,7 @@ tar -xf glib-2.72.2.tar.xz cd glib-2.72.2 patch -Np1 -i ../patches/glib-2.72.0-lessnoisy.patch mkdir glib-build; cd glib-build -meson --prefix=/usr --buildtype=release -Dman=true .. +meson --prefix=/usr --buildtype=minsize -Dman=true .. ninja ninja install install -t /usr/share/licenses/glib -Dm644 ../COPYING @@ -2952,7 +2952,7 @@ rm -rf pkg-config-0.29.2 tar -xf libsigc++-2.10.8.tar.xz cd libsigc++-2.10.8 mkdir sigc++-build; cd sigc++-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libsigc++ -Dm644 ../COPYING @@ -2962,7 +2962,7 @@ rm -rf libsigc++-2.10.8 tar -xf glibmm-2.66.4.tar.xz cd glibmm-2.66.4 mkdir glibmm-build; cd glibmm-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/glibmm -Dm644 ../COPYING ../COPYING.tools @@ -2972,7 +2972,7 @@ rm -rf glibmm-2.66.4 tar -xf gobject-introspection-1.72.0.tar.xz cd gobject-introspection-1.72.0 mkdir gobj-build; cd gobj-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/gobject-introspection -Dm644 ../COPYING ../COPYING.GPL ../COPYING.LGPL @@ -2982,7 +2982,7 @@ rm -rf gobject-introspection-1.72.0 tar -xf shared-mime-info-2.2.tar.gz cd shared-mime-info-2.2 mkdir smi-build; cd smi-build -meson --prefix=/usr --buildtype=release -Dupdate-mimedb=true .. +meson --prefix=/usr --buildtype=minsize -Dupdate-mimedb=true .. ninja ninja install install -t /usr/share/licenses/shared-mime-info -Dm644 ../COPYING @@ -2993,7 +2993,7 @@ tar -xf desktop-file-utils-0.26.tar.xz cd desktop-file-utils-0.26 patch -Np1 -i ../patches/desktop-file-utils-0.26-specification1.5.patch mkdir dfu-build; cd dfu-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -dm755 /usr/share/applications @@ -3005,7 +3005,7 @@ rm -rf desktop-file-utils-0.26 tar -xf graphene-1.10.8.tar.gz cd graphene-1.10.8 mkdir graphene-build; cd graphene-build -meson --prefix=/usr --buildtype=release -Dtests=false -Dinstalled_tests=false .. +meson --prefix=/usr --buildtype=minsize -Dtests=false -Dinstalled_tests=false .. ninja ninja install install -t /usr/share/licenses/graphene -Dm644 ../LICENSE.txt @@ -3097,7 +3097,7 @@ rm -rf volume_key-volume_key-0.3.12 tar -xf json-glib-1.6.6.tar.xz cd json-glib-1.6.6 mkdir json-build; cd json-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/json-glib -Dm644 ../COPYING @@ -3167,7 +3167,7 @@ rm -rf graphite2-1.3.14 tar -xf harfbuzz-4.3.0.tar.xz cd harfbuzz-4.3.0 mkdir hb-build; cd hb-build -meson --prefix=/usr --buildtype=release -Dgraphite2=enabled -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/harfbuzz -Dm644 ../COPYING @@ -3357,7 +3357,7 @@ rm -rf libdaemon-0.14 tar -xf libgudev-237.tar.xz cd libgudev-237 mkdir libgudev-build; cd libgudev-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libgudev -Dm644 ../COPYING @@ -3385,7 +3385,7 @@ rm -rf libqmi-1.30.6 tar -xf libwacom-2.2.0.tar.xz cd libwacom-2.2.0 mkdir wacom-build; cd wacom-build -meson --prefix=/usr --buildtype=release -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/libwacom -Dm644 ../COPYING @@ -3404,7 +3404,7 @@ rm -rf mtdev-1.1.6 tar -xf wayland-1.20.0.tar.xz cd wayland-1.20.0 mkdir wayland-build; cd wayland-build -meson --prefix=/usr --buildtype=release -Ddocumentation=false -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Ddocumentation=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/wayland -Dm644 ../COPYING @@ -3414,7 +3414,7 @@ rm -rf wayland-1.20.0 tar -xf wayland-protocols-1.25.tar.xz cd wayland-protocols-1.25 mkdir wayland-protocols-build; cd wayland-protocols-build -meson --prefix=/usr --buildtype=release -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dtests=false .. ninja ninja install install -t /usr/share/licenses/wayland-protocols -Dm644 ../COPYING @@ -3453,7 +3453,7 @@ rm -rf enchant-2.3.3 tar -xf fontconfig-2.14.0.tar.bz2 cd fontconfig-2.14.0 mkdir FC-build; cd FC-build -meson --prefix=/usr --buildtype=release -Ddoc=disabled .. +meson --prefix=/usr --buildtype=minsize -Ddoc=disabled .. ninja ninja install install -t /usr/share/licenses/fontconfig -Dm644 ../COPYING @@ -3463,7 +3463,7 @@ rm -rf fontconfig-2.14.0 tar -xf fribidi-1.0.12.tar.xz cd fribidi-1.0.12 mkdir fribidi-build; cd fribidi-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/fribidi -Dm644 ../COPYING @@ -3528,7 +3528,7 @@ rm -rf libgphoto2-2.5.29 tar -xf pixman-0.40.0.tar.gz cd pixman-0.40.0 mkdir pixman-build; cd pixman-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/pixman -Dm644 ../COPYING @@ -3850,7 +3850,7 @@ done tar -xf libdrm-2.4.111.tar.xz cd libdrm-2.4.111 mkdir libdrm-build; cd libdrm-build -meson --prefix=/usr --buildtype=release -Dudev=true -Dvalgrind=false .. +meson --prefix=/usr --buildtype=minsize -Dudev=true -Dvalgrind=false .. ninja ninja install install -t /usr/share/licenses/libdrm -Dm644 ../../extra-package-licenses/libdrm-license.txt @@ -3860,7 +3860,7 @@ rm -rf libdrm-2.4.111 tar -xf DirectX-Headers-1.602.0.tar.gz cd DirectX-Headers-1.602.0 mkdir DXH-build; cd DXH-build -meson --prefix=/usr --buildtype=release -Dbuild-test=false .. +meson --prefix=/usr --buildtype=minsize -Dbuild-test=false .. ninja ninja install install -t /usr/share/licenses/directx-headers -Dm644 ../LICENSE @@ -3936,7 +3936,7 @@ rm -rf libva-2.14.0 tar -xf libvdpau-1.5.tar.bz2 cd libvdpau-1.5 mkdir vdpau-build; cd vdpau-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libvdpau -Dm644 ../COPYING @@ -3947,7 +3947,7 @@ tar -xf libglvnd-v1.4.0.tar.bz2 cd libglvnd-v1.4.0 cat README.md | tail -n211 | head -n22 | sed 's/ //g' > COPYING mkdir glvnd-build; cd glvnd-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libglvnd -Dm644 ../COPYING @@ -3957,7 +3957,7 @@ rm -rf libglvnd-v1.4.0 tar -xf mesa-22.1.2.tar.xz cd mesa-22.1.2 mkdir mesa-build; cd mesa-build -meson --prefix=/usr --buildtype=release -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled .. +meson --prefix=/usr --buildtype=minsize -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled .. ninja ninja install install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst @@ -4033,7 +4033,7 @@ rm -rf xkeyboard-config-2.36 tar -xf libxkbcommon-1.4.1.tar.xz cd libxkbcommon-1.4.1 mkdir xkb-build; cd xkb-build -meson --prefix=/usr --buildtype=release -Denable-docs=false .. +meson --prefix=/usr --buildtype=minsize -Denable-docs=false .. ninja ninja install install -t /usr/share/licenses/libxkbcommon -Dm644 ../LICENSE @@ -4044,7 +4044,7 @@ tar -xf systemd-stable-251.2.tar.gz cd systemd-stable-251.2 sed -i -e 's/GROUP="render"/GROUP="video"/' -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in mkdir systemd-build; cd systemd-build -meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=release -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=true -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=true .. +meson --prefix=/usr --sysconfdir=/etc --localstatedir=/var --buildtype=minsize -Dmode=release -Dversion-tag=251.2-massos -Dshared-lib-tag=251.2-massos -Dcryptolib=openssl -Ddefault-dnssec=no -Ddns-over-tls=openssl -Dfallback-hostname=massos -Dhomed=true -Dinstall-tests=false -Dman=true -Dpamconfdir=/etc/pam.d -Drpmmacrosdir=no -Dsysusers=false -Dtests=false -Duserdb=true .. ninja ninja install cat > /etc/pam.d/systemd-user << END @@ -4104,7 +4104,7 @@ rm -rf alsa-lib-1.2.7.1 tar -xf libepoxy-1.5.10.tar.gz cd libepoxy-1.5.10 mkdir epoxy-build; cd epoxy-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libepoxy -Dm644 ../COPYING @@ -4114,7 +4114,7 @@ rm -rf libepoxy-1.5.10 tar -xf libxcvt-0.1.1.tar.xz cd libxcvt-0.1.1 mkdir xcvt-build; cd xcvt-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libxcvt -Dm644 ../COPYING @@ -4168,7 +4168,7 @@ rm -rf xf86-input-evdev-2.10.6 tar -xf libinput-1.21.0.tar.bz2 cd libinput-1.21.0 mkdir libinput-build; cd libinput-build -meson --prefix=/usr --buildtype=release -Ddebug-gui=false -Dtests=false -Ddocumentation=false .. +meson --prefix=/usr --buildtype=minsize -Ddebug-gui=false -Dtests=false -Ddocumentation=false .. ninja ninja install install -t /usr/share/licenses/libinput -Dm644 ../COPYING @@ -4263,7 +4263,7 @@ rm -rf xf86-video-vmware-13.3.0 tar -xf intel-vaapi-driver-2.4.1.tar.bz2 cd intel-vaapi-driver-2.4.1 mkdir IVD-build; cd IVD-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/intel-vaapi-driver -Dm644 ../COPYING @@ -4445,7 +4445,7 @@ sed -i '/policy,/d' actions/meson.build sed -i '/policy,/d' src/examples/meson.build patch -Np1 -i ../patches/polkit-0.120-backports.patch mkdir polkit-build; cd polkit-build -meson --prefix=/usr --buildtype=release -Dgtk_doc=true -Dman=true -Dsession_tracking=libsystemd-login .. +meson --prefix=/usr --buildtype=minsize -Dgtk_doc=true -Dman=true -Dsession_tracking=libsystemd-login .. ninja ninja install cat > /etc/pam.d/polkit-1 << "END" @@ -4480,7 +4480,7 @@ rm -rf openssh-9.0p1 tar -xf sshfs-3.7.3.tar.xz cd sshfs-3.7.3 mkdir sshfs-build; cd sshfs-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/sshfs -Dm644 ../COPYING @@ -4490,7 +4490,7 @@ rm -rf sshfs-3.7.3 tar -xf glu-9.0.2.tar.xz cd glu-9.0.2 mkdir glu-build; cd glu-build -meson --prefix=/usr --buildtype=release -Dgl_provider=gl .. +meson --prefix=/usr --buildtype=minsize -Dgl_provider=gl .. ninja ninja install rm -f /usr/lib/libGLU.a @@ -4539,7 +4539,7 @@ rm -rf jasper-version-3.0.4 tar -xf atk-2.38.0.tar.xz cd atk-2.38.0 mkdir atk-build; cd atk-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/atk -Dm644 ../COPYING @@ -4549,7 +4549,7 @@ rm -rf atk-2.38.0 tar -xf atkmm-2.28.2.tar.xz cd atkmm-2.28.2 mkdir atkmm-build; cd atkmm-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/atkmm -Dm644 ../COPYING ../COPYING.tools @@ -4559,7 +4559,7 @@ rm -rf atkmm-2.28.2 tar -xf gdk-pixbuf-2.42.8.tar.xz cd gdk-pixbuf-2.42.8 mkdir pixbuf-build; cd pixbuf-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install gdk-pixbuf-query-loaders --update-cache @@ -4571,7 +4571,7 @@ tar -xf cairo-1.17.6.tar.bz2 cd cairo-1.17.6 patch -Np1 -i ../patches/cairo-1.17.6-upstreamfix.patch mkdir cairo-build; cd cairo-build -meson --prefix=/usr --buildtype=release -Dgl-backend=auto -Dtee=enabled -Dtests=disabled -Dxlib-xcb=enabled -Dxml=enabled .. +meson --prefix=/usr --buildtype=minsize -Dgl-backend=auto -Dtee=enabled -Dtests=disabled -Dxlib-xcb=enabled -Dxml=enabled .. ninja ninja install install -t /usr/share/licenses/cairo -Dm644 ../COPYING ../COPYING-LGPL-2.1 @@ -4581,7 +4581,7 @@ rm -rf cairo-1.17.6 tar -xf cairomm-1.14.0.tar.xz cd cairomm-1.14.0 mkdir cmm-build; cd cmm-build -meson --prefix=/usr --buildtype=release -Dbuild-examples=false -Dbuild-tests=false .. +meson --prefix=/usr --buildtype=minsize -Dbuild-examples=false -Dbuild-tests=false .. ninja ninja install install -t /usr/share/licenses/cairomm -Dm644 ../COPYING @@ -4591,7 +4591,7 @@ rm -rf cairomm-1.14.0 tar -xf harfbuzz-4.3.0.tar.xz cd harfbuzz-4.3.0 mkdir hb-build; cd hb-build -meson --prefix=/usr --buildtype=release -Dgraphite2=enabled -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install cd ../.. @@ -4600,7 +4600,7 @@ rm -rf harfbuzz-4.3.0 tar -xf pango-1.50.7.tar.xz cd pango-1.50.7 mkdir pango-build; cd pango-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/pango -Dm644 ../COPYING @@ -4610,7 +4610,7 @@ rm -rf pango-1.50.7 tar -xf pangomm-2.46.2.tar.xz cd pangomm-2.46.2 mkdir pmm-build; cd pmm-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/pangomm -Dm644 ../COPYING ../COPYING.tools @@ -4707,7 +4707,7 @@ rm -rf vala-0.56.1 tar -xf libgusb-0.3.10.tar.xz cd libgusb-0.3.10 mkdir GUSB-build; cd GUSB-build -meson --prefix=/usr --buildtype=release -Ddocs=false .. +meson --prefix=/usr --buildtype=minsize -Ddocs=false .. ninja ninja install install -t /usr/share/licenses/libgusb -Dm644 ../COPYING @@ -4736,7 +4736,7 @@ rm -rf adwaita-icon-theme-41.0 tar -xf at-spi2-core-2.44.1.tar.xz cd at-spi2-core-2.44.1 mkdir spi2-build; cd spi2-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/at-spi2-core -Dm644 ../COPYING @@ -4746,7 +4746,7 @@ rm -rf at-spi2-core-2.44.1 tar -xf at-spi2-atk-2.38.0.tar.xz cd at-spi2-atk-2.38.0 mkdir spi2-build; cd spi2-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install glib-compile-schemas /usr/share/glib-2.0/schemas @@ -4761,7 +4761,7 @@ useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 -g colord -s /bin/false mv po/fur.po po/ur.po sed -i 's/fur/ur/' po/LINGUAS mkdir colord-build; cd colord-build -meson --prefix=/usr --buildtype=release -Ddaemon_user=colord -Dvapi=true -Dsystemd=true -Dlibcolordcompat=true -Dargyllcms_sensor=false -Dman=false -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Ddaemon_user=colord -Dvapi=true -Dsystemd=true -Dlibcolordcompat=true -Dargyllcms_sensor=false -Dman=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/colord -Dm644 ../COPYING @@ -4790,7 +4790,7 @@ rm -rf cups-2.4.2 tar -xf gtk-3.24.34.tar.bz2 cd gtk-3.24.34 mkdir gtk3-build; cd gtk3-build -meson --prefix=/usr --buildtype=release -Dbroadway_backend=true -Dcolord=yes -Dexamples=false -Dman=true -Dprint_backends=cups,file,lpr -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dbroadway_backend=true -Dcolord=yes -Dexamples=false -Dman=true -Dprint_backends=cups,file,lpr -Dtests=false .. ninja ninja install gtk-query-immodules-3.0 --update-cache @@ -4802,7 +4802,7 @@ rm -rf gtk-3.24.34 tar -xf gtkmm-3.24.6.tar.xz cd gtkmm-3.24.6 mkdir gmm-build; cd gmm-build -meson --prefix=/usr --buildtype=release -Dbuild-demos=false -Dbuild-tests=false .. +meson --prefix=/usr --buildtype=minsize -Dbuild-demos=false -Dbuild-tests=false .. ninja ninja install install -t /usr/share/licenses/gtkmm3 -Dm644 ../COPYING ../COPYING.tools @@ -4812,7 +4812,7 @@ rm -rf gtkmm-3.24.6 tar -xf libhandy-1.6.2.tar.xz cd libhandy-1.6.2 mkdir handy-build; cd handy-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libhandy -Dm644 ../COPYING @@ -4822,7 +4822,7 @@ rm -rf libhandy-1.6.2 tar -xf libdazzle-3.44.0.tar.xz cd libdazzle-3.44.0 mkdir DAZZLE-build; cd DAZZLE-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libdazzle -Dm644 ../COPYING @@ -4832,7 +4832,7 @@ rm -rf libdazzle-3.44.0 tar -xf sysprof-3.44.0.tar.xz cd sysprof-3.44.0 mkdir SYSPROF-build; cd SYSPROF-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install sed -i 's/Development/System/' /usr/share/applications/org.gnome.Sysprof3.desktop @@ -4843,7 +4843,7 @@ rm -rf sysprof-3.44.0 tar -xf vte-0.68.0.tar.bz2 cd vte-0.68.0 mkdir vte-build; cd vte-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install rm -f /etc/profile.d/vte.* @@ -4883,7 +4883,7 @@ rm -rf pycairo-1.21.0 tar -xf pygobject-3.42.1.tar.xz cd pygobject-3.42.1 mkdir pygo-build; cd pygo-build -meson --prefix=/usr --buildtype=release -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dtests=false .. ninja ninja install install -t /usr/share/licenses/pygobject -Dm644 ../COPYING @@ -4909,7 +4909,7 @@ rm -rf python-dbusmock-0.27.5 tar -xf gexiv2-0.14.0.tar.xz cd gexiv2-0.14.0 mkdir gexiv2-build; cd gexiv2-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/gexiv2 -Dm644 ../COPYING @@ -4919,7 +4919,7 @@ rm -rf gexiv2-0.14.0 tar -xf libpeas-1.32.0.tar.xz cd libpeas-1.32.0 mkdir libpeas-build; cd libpeas-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libpeas -Dm644 ../COPYING @@ -4929,7 +4929,7 @@ rm -rf libpeas-1.32.0 tar -xf libgxps-0.3.2.tar.xz cd libgxps-0.3.2 mkdir gxps-build; cd gxps-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libgxps -Dm644 ../COPYING @@ -5108,7 +5108,7 @@ rm -rf avahi-0.8 tar -xf orc-0.4.32.tar.gz cd orc-0.4.32 mkdir orc-build; cd orc-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install rm -f /usr/lib/liborc-test-0.4.a @@ -5119,7 +5119,7 @@ rm -rf orc-0.4.32 tar -xf pulseaudio-16.0.tar.xz cd pulseaudio-16.0 mkdir pulse-build; cd pulse-build -meson --prefix=/usr --buildtype=release -Ddatabase=gdbm -Ddoxygen=false .. +meson --prefix=/usr --buildtype=minsize -Ddatabase=gdbm -Ddoxygen=false .. ninja ninja install rm -f /etc/dbus-1/system.d/pulseaudio-system.conf @@ -5256,7 +5256,7 @@ rm -rf vim-8.2.5046 tar -xf libwpe-1.13.1.tar.xz cd libwpe-1.13.1 mkdir wpe-build; cd wpe-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libwpe -Dm644 ../COPYING @@ -5278,7 +5278,7 @@ rm -rf openjpeg-2.5.0 tar -xf libsecret-0.20.5.tar.xz cd libsecret-0.20.5 mkdir secret-build; cd secret-build -meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. +meson --prefix=/usr --buildtype=minsize -Dgtk_doc=false .. ninja ninja install install -t /usr/share/licenses/libsecret -Dm644 ../COPYING ../COPYING.TESTS @@ -5291,7 +5291,7 @@ sed -i 's:"/desktop:"/org:' schema/*.xml sed -e '208 s/@BASENAME@/gcr-viewer.desktop/' -e '231 s/@BASENAME@/gcr-prompter.desktop/' -i ui/meson.build patch -Np1 -i ../patches/gcr-3.41.0-meson-0.61.0-fix.patch mkdir gcr-build; cd gcr-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/gcr -Dm644 ../COPYING @@ -5311,7 +5311,7 @@ tar -xf accountsservice-22.08.8.tar.xz cd accountsservice-22.08.8 sed -i '/PrivateTmp/d' data/accounts-daemon.service.in mkdir as-build; cd as-build -meson --prefix=/usr --buildtype=release -Dadmin_group=wheel .. +meson --prefix=/usr --buildtype=minsize -Dadmin_group=wheel .. ninja ninja install install -t /usr/share/licenses/accountsservice -Dm644 ../COPYING @@ -5707,7 +5707,7 @@ rm -rf newt-0.52.21 tar -xf upower-v0.99.19.tar.bz2 cd upower-v0.99.19 mkdir upower-build; cd upower-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/upower -Dm644 ../COPYING @@ -5718,7 +5718,7 @@ rm -rf upower-v0.99.19 tar -xf NetworkManager-1.38.2.tar.xz cd NetworkManager-1.38.2 mkdir nm-build; cd nm-build -meson --prefix=/usr --buildtype=release -Dnmtui=true -Dqt=false -Dselinux=false -Dsession_tracking=systemd -Dtests=no .. +meson --prefix=/usr --buildtype=minsize -Dnmtui=true -Dqt=false -Dselinux=false -Dsession_tracking=systemd -Dtests=no .. ninja ninja install cat >> /etc/NetworkManager/NetworkManager.conf << END @@ -5752,7 +5752,7 @@ rm -rf NetworkManager-1.38.2 tar -xf libnma-1.8.40.tar.xz cd libnma-1.8.40 mkdir nma-build; cd nma-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libnma -Dm644 ../COPYING ../COPYING.LGPL @@ -5762,7 +5762,7 @@ rm -rf libnma-1.8.40 tar -xf libnotify-0.7.12.tar.xz cd libnotify-0.7.12 mkdir notify-build; cd notify-build -meson --prefix=/usr --buildtype=release -Dman=false -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dman=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libnotify -Dm644 ../COPYING @@ -5781,7 +5781,7 @@ rm -rf startup-notification-0.12 tar -xf libwnck-40.1.tar.xz cd libwnck-40.1 mkdir wnck-build; cd wnck-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libwnck -Dm644 ../COPYING @@ -5791,7 +5791,7 @@ rm -rf libwnck-40.1 tar -xf network-manager-applet-1.28.0.tar.xz cd network-manager-applet-1.28.0 mkdir nma-build; cd nma-build -meson --prefix=/usr --buildtype=release -Dappindicator=no -Dselinux=false .. +meson --prefix=/usr --buildtype=minsize -Dappindicator=no -Dselinux=false .. ninja ninja install install -t /usr/share/licenses/network-manager-applet -Dm644 ../COPYING @@ -5822,7 +5822,7 @@ tar -xf gsettings-desktop-schemas-42.0.tar.xz cd gsettings-desktop-schemas-42.0 sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in mkdir gsds-build; cd gsds-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install glib-compile-schemas /usr/share/glib-2.0/schemas @@ -5833,7 +5833,7 @@ rm -rf gsettings-desktop-schemas-42.0 tar -xf glib-networking-2.72.0.tar.xz cd glib-networking-2.72.0 mkdir glibnet-build; cd glibnet-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/glib-networking -Dm644 ../COPYING @@ -5843,7 +5843,7 @@ rm -rf glib-networking-2.72.0 tar -xf libsoup-2.74.2.tar.xz cd libsoup-2.74.2 mkdir soup-build; cd soup-build -meson --prefix=/usr --buildtype=release -Dtests=false -Dvapi=enabled .. +meson --prefix=/usr --buildtype=minsize -Dtests=false -Dvapi=enabled .. ninja ninja install install -t /usr/share/licenses/libsoup -Dm644 ../COPYING @@ -5853,7 +5853,7 @@ rm -rf libsoup-2.74.2 tar -xf libsoup-3.0.6.tar.xz cd libsoup-3.0.6 mkdir soup3-build; cd soup3-build -meson --prefix=/usr --buildtype=release -Dpkcs11_tests=disabled -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dpkcs11_tests=disabled -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING @@ -5873,7 +5873,7 @@ rm -rf libostree-2022.4 tar -xf libxmlb-0.3.6.tar.gz cd libxmlb-0.3.6 mkdir xmlb-build; cd xmlb-build -meson --prefix=/usr --buildtype=release -Dstemmer=true .. +meson --prefix=/usr --buildtype=minsize -Dstemmer=true .. ninja ninja install install -t /usr/share/licenses/libxmlb -Dm644 ../LICENSE @@ -5883,7 +5883,7 @@ rm -rf libxmlb-0.3.6 tar -xf AppStream-0.15.4.tar.xz cd AppStream-0.15.4 mkdir appstream-build; cd appstream-build -meson --prefix=/usr --buildtype=release -Dvapi=true -Dcompose=true .. +meson --prefix=/usr --buildtype=minsize -Dvapi=true -Dcompose=true .. ninja ninja install install -t /usr/share/licenses/appstream -Dm644 ../COPYING @@ -5893,7 +5893,7 @@ rm -rf AppStream-0.15.4 tar -xf appstream_glib_0_7_18.tar.gz cd appstream-glib-appstream_glib_0_7_18 mkdir appstream-glib-build; cd appstream-glib-build -meson --prefix=/usr --buildtype=release -Drpm=false .. +meson --prefix=/usr --buildtype=minsize -Drpm=false .. ninja ninja install install -t /usr/share/licenses/appstream-glib -Dm644 ../COPYING @@ -5903,7 +5903,7 @@ rm -rf appstream-glib-appstream_glib_0_7_18 tar -xf bubblewrap-0.6.2.tar.xz cd bubblewrap-0.6.2 mkdir bwrap-build; cd bwrap-build -meson --prefix=/usr --buildtype=release -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dtests=false .. ninja ninja install install -t /usr/share/licenses/bubblewrap -Dm644 ../COPYING @@ -5913,7 +5913,7 @@ rm -rf bubblewrap-0.6.2 tar -xf xdg-dbus-proxy-0.1.4.tar.xz cd xdg-dbus-proxy-0.1.4 mkdir xdp-build; cd xdp-build -meson --prefix=/usr --buildtype=release -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dtests=false .. ninja ninja install install -t /usr/share/licenses/xdg-dbus-proxy -Dm644 ../COPYING @@ -5946,7 +5946,7 @@ rm -rf flatpak-1.13.2 tar -xf libportal-0.6.tar.xz cd libportal-0.6 mkdir portal-build; cd portal-build -meson --prefix=/usr --buildtype=release -Dbackends=gtk3 -Ddocs=false -Dtests=false .. +meson --prefix=/usr --buildtype=minsize -Dbackends=gtk3 -Ddocs=false -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libportal -Dm644 ../COPYING @@ -5957,7 +5957,7 @@ rm -rf libportal-0.6 tar -xf geoclue-2.6.0.tar.bz2 cd geoclue-2.6.0 mkdir geoclue-build; cd geoclue-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/geoclue -Dm644 ../COPYING ../COPYING.LIB @@ -5994,7 +5994,7 @@ rm -rf rest-0.8.1 tar -xf wpebackend-fdo-1.12.0.tar.xz cd wpebackend-fdo-1.12.0 mkdir fdo-build; cd fdo-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/wpebackend-fdo -Dm644 ../COPYING @@ -6013,7 +6013,7 @@ rm -rf libass-0.16.0 tar -xf openh264-2.1.1.tar.gz cd openh264-2.1.1 mkdir H264-build; cd H264-build -meson --prefix=/usr --buildtype=release -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dtests=disabled .. ninja ninja install rm -f /usr/lib/libopenh264.a @@ -6187,7 +6187,7 @@ rm -rf a52dec-0.7.4 tar -xf dav1d-1.0.0.tar.xz cd dav1d-1.0.0 mkdir dav1d-build; cd dav1d-build -meson --prefix=/usr --buildtype=release -Denable_tests=false .. +meson --prefix=/usr --buildtype=minsize -Denable_tests=false .. ninja ninja install install -t /usr/share/licenses/dav1d -Dm644 ../COPYING @@ -6246,7 +6246,7 @@ rm -rf libmysofa-1.2.1 tar -xf vmaf-2.3.0.tar.gz cd vmaf-2.3.0/libvmaf mkdir vmaf-build; cd vmaf-build -meson --prefix=/usr --buildtype=release -Denable_docs=false .. +meson --prefix=/usr --buildtype=minsize -Denable_docs=false .. ninja ninja install rm -f /usr/lib/libvmaf.a @@ -6279,7 +6279,7 @@ rm -rf openal-soft-1.21.1 tar -xf gstreamer-1.20.3.tar.xz cd gstreamer-1.20.3 mkdir gstreamer-build; cd gstreamer-build -meson --prefix=/usr --buildtype=release -Dbenchmarks=disabled -Dexamples=disabled -Dgst_debug=false -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dbenchmarks=disabled -Dexamples=disabled -Dgst_debug=false -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gstreamer -Dm644 ../COPYING @@ -6289,7 +6289,7 @@ rm -rf gstreamer-1.20.3 tar -xf gst-plugins-base-1.20.3.tar.xz cd gst-plugins-base-1.20.3 mkdir base-build; cd base-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-base -Dm644 ../COPYING @@ -6299,7 +6299,7 @@ rm -rf gst-plugins-base-1.20.3 tar -xf gst-plugins-good-1.20.3.tar.xz cd gst-plugins-good-1.20.3 mkdir good-build; cd good-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dexamples=disabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-good -Dm644 ../COPYING @@ -6309,7 +6309,7 @@ rm -rf gst-plugins-good-1.20.3 tar -xf gst-plugins-bad-1.20.3.tar.xz cd gst-plugins-bad-1.20.3 mkdir bad-build; cd bad-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dexamples=disabled -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-bad -Dm644 ../COPYING @@ -6319,7 +6319,7 @@ rm -rf gst-plugins-bad-1.20.3 tar -xf gst-plugins-ugly-1.20.3.tar.xz cd gst-plugins-ugly-1.20.3 mkdir ugly-build; cd ugly-build -meson --prefix=/usr --buildtype=release -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dgpl=enabled -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-plugins-ugly -Dm644 ../COPYING @@ -6329,7 +6329,7 @@ rm -rf gst-plugins-ugly-1.20.3 tar -xf gst-libav-1.20.3.tar.xz cd gst-libav-1.20.3 mkdir gst-libav-build; cd gst-libav-build -meson --prefix=/usr --buildtype=release -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dpackage-name="MassOS GStreamer 1.20.3" -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gst-libav -Dm644 ../COPYING @@ -6339,7 +6339,7 @@ rm -rf gst-libav-1.20.3 tar -xf gstreamer-vaapi-1.20.3.tar.xz cd gstreamer-vaapi-1.20.3 mkdir gstreamer-vaapi-build; cd gstreamer-vaapi-build -meson --prefix=/usr --buildtype=release -Dexamples=disabled -Dpackage-origin="https://massos.org" -Dtests=disabled .. +meson --prefix=/usr --buildtype=minsize -Dexamples=disabled -Dpackage-origin="https://massos.org" -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/gstreamer-vaapi -Dm644 ../COPYING.LIB @@ -6352,7 +6352,7 @@ patch -Np1 -i ../patches/pipewire-0.3.52-upstreamfix.patch mkdir -p subprojects/wireplumber tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1 mkdir pipewire-build; cd pipewire-build -meson --prefix=/usr --buildtype=release -Db_pie=false -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber -Dwireplumber:system-lua=true -Dwireplumber:tests=false .. +meson --prefix=/usr --buildtype=minsize -Db_pie=false -Dexamples=disabled -Dffmpeg=enabled -Dtests=disabled -Dvulkan=enabled -Dsession-managers=wireplumber -Dwireplumber:system-lua=true -Dwireplumber:tests=false .. ninja ninja install systemctl --global enable pipewire.socket pipewire-pulse.socket @@ -6422,7 +6422,7 @@ rm -rf clutter-gtk-1.8.4 tar -xf libchamplain-0.12.20.tar.xz cd libchamplain-0.12.20 mkdir champlain-build; cd champlain-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/libchamplain -Dm644 ../COPYING @@ -6451,7 +6451,7 @@ rm -rf gnome-online-accounts-3.44.0 tar -xf libgdata-0.18.1.tar.xz cd libgdata-0.18.1 mkdir gdata-build; cd gdata-build -meson --prefix=/usr --buildtype=release -Dalways_build_tests=false .. +meson --prefix=/usr --buildtype=minsize -Dalways_build_tests=false .. ninja ninja install install -t /usr/share/licenses/libgdata -Dm644 ../COPYING @@ -6461,7 +6461,7 @@ rm -rf libgdata-0.18.1 tar -xf gvfs-1.50.2.tar.xz cd gvfs-1.50.2 mkdir gvfs-build; cd gvfs-build -meson --prefix=/usr --buildtype=release -Dman=true .. +meson --prefix=/usr --buildtype=minsize -Dman=true .. ninja ninja install glib-compile-schemas /usr/share/glib-2.0/schemas @@ -6691,7 +6691,7 @@ rm -rf xfce4-terminal-1.0.4 tar -xf shotwell-0.31.3-133-gd55abab2.tar.xz cd shotwell-0.31.3-133-gd55abab2 mkdir SHOTWELL-build; cd SHOTWELL-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/shotwell -Dm644 ../COPYING @@ -6840,7 +6840,7 @@ rm -rf thunar-archive-plugin-0.5.0 tar -xf gtksourceview-4.8.3.tar.xz cd gtksourceview-4.8.3 mkdir build; cd build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/gtksourceview4 -Dm644 ../COPYING @@ -6895,7 +6895,7 @@ rm -rf mugshot-0.4.3 tar -xf evince-42.3.tar.xz cd evince-42.3 mkdir build; cd build -meson --prefix=/usr --buildtype=release -Dnautilus=false .. +meson --prefix=/usr --buildtype=minsize -Dnautilus=false .. ninja ninja install install -t /usr/share/licenses/evince -Dm644 ../COPYING @@ -6905,7 +6905,7 @@ rm -rf evince-42.3 tar -xf baobab-41.0.tar.xz cd baobab-41.0 mkdir baobab-build; cd baobab-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/baobab -Dm644 ../COPYING ../COPYING.docs @@ -6917,7 +6917,7 @@ cd malcontent-0.10.4 tar -xf ../libglib-testing-0.1.1.tar.bz2 -C subprojects mv subprojects/libglib-testing{-0.1.1,} mkdir malcontent-build; cd malcontent-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. ninja ninja install rm -f /usr/share/applications/org.freedesktop.MalcontentControl.desktop @@ -6928,7 +6928,7 @@ rm -rf malcontent-0.10.4 tar -xf gnome-software-41.5.tar.xz cd gnome-software-41.5 mkdir gnome-software-build; cd gnome-software-build -meson --prefix=/usr --buildtype=release -Dfwupd=false -Dpackagekit=false -Dtests=false -Dvalgrind=false .. +meson --prefix=/usr --buildtype=minsize -Dfwupd=false -Dpackagekit=false -Dtests=false -Dvalgrind=false .. ninja ninja install install -t /usr/share/licenses/gnome-software -Dm644 ../COPYING @@ -6938,7 +6938,7 @@ rm -rf gnome-software-41.5 tar -xf massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c.tar.gz cd massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c mkdir MassOS-Welcome-build; cd MassOS-Welcome-build -meson --prefix=/usr --buildtype=release .. +meson --prefix=/usr --buildtype=minsize .. RUSTFLAGS="-C relocation-model=dynamic-no-pic" ninja install -m755 target/release/gnome-tour /usr/bin/massos-welcome cat > /usr/bin/firstlogin << "END" From e3cb6a5b677f9e9b5b4fd19c0e21e603893efa74 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sun, 19 Jun 2022 16:17:11 +0100 Subject: [PATCH 20/32] Changelog addition --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 6120eb0..8870697 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ This document contains the full changelog for every previous versions of MassOS, Changes: - Fixed an issue setting the default locale in the MassOS Installer (https://github.com/MassOS-Linux/MassOS/issues/35). +- Added mouse/cursor support for non-graphical environments (e.g. tty terminals). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. - Replaced dhclient with dhcpcd, as dhclient is now deprecated upstream. From bb9bd5f7d2deb06c3a8ddb4b71cec4b543d01562 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 25 Jun 2022 15:19:54 +0100 Subject: [PATCH 21/32] Fix long startup time in Firefox/Evince Hopefully this should address https://github.com/MassOS-Linux/MassOS/issues/29 --- build-system.sh | 6 ++++++ changelog.md | 1 + 2 files changed, 7 insertions(+) diff --git a/build-system.sh b/build-system.sh index 68113ac..d6797a5 100755 --- a/build-system.sh +++ b/build-system.sh @@ -6377,6 +6377,12 @@ cd xdg-desktop-portal-gtk-1.14.0 ./configure --prefix=/usr make make install +cat > /etc/xdg/autostart/xdg-desktop-portal-gtk.desktop << "END" +[Desktop Entry] +Type=Application +Name=Portal service (GTK/GNOME implementation) +Exec=/bin/bash -c "dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY; systemctl start --user xdg-desktop-portal-gtk.service" +END install -t /usr/share/licenses/xdg-desktop-portal-gtk -Dm644 COPYING cd .. rm -rf xdg-desktop-portal-gtk-1.14.0 diff --git a/changelog.md b/changelog.md index 8870697..a03e518 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ This document contains the full changelog for every previous versions of MassOS, # Current Development Changes: +- Fixed very long startup times in Firefox and Evince (https://github.com/MassOS-Linux/MassOS/issues/29). - Fixed an issue setting the default locale in the MassOS Installer (https://github.com/MassOS-Linux/MassOS/issues/35). - Added mouse/cursor support for non-graphical environments (e.g. tty terminals). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. From f877ed6ff7f5fd13358f10af1900422b1a75e884 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Mon, 27 Jun 2022 00:19:06 +0100 Subject: [PATCH 22/32] Updates and minor fixes --- build-system.sh | 168 +++++++++--------- changelog.md | 19 +- .../xf86-video-vesa-2.5.0-upstreamfix.patch | 91 ++++++++++ source-urls | 47 ++--- stage1.sh | 6 +- utils/build-configs/kernel-config | 5 +- 6 files changed, 224 insertions(+), 112 deletions(-) create mode 100644 patches/xf86-video-vesa-2.5.0-upstreamfix.patch diff --git a/build-system.sh b/build-system.sh index d6797a5..fd2a807 100755 --- a/build-system.sh +++ b/build-system.sh @@ -827,15 +827,16 @@ install -t /usr/share/licenses/libffi -Dm644 LICENSE cd .. rm -rf libffi-3.4.2 # OpenSSL. -tar -xf openssl-3.0.3.tar.gz -cd openssl-3.0.3 +tar -xf openssl-3.0.4.tar.gz +cd openssl-3.0.4 +sed -i '223i\ factor_size /= sizeof(BN_ULONG) * 8;' crypto/bn/rsaz_exp_x2.c ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib shared zlib-dynamic make sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile make MANSUFFIX=ssl install install -t /usr/share/licenses/openssl -Dm644 LICENSE.txt cd .. -rm -rf openssl-3.0.3 +rm -rf openssl-3.0.4 # easy-rsa. tar -xf EasyRSA-3.1.0.tgz cd EasyRSA-3.1.0 @@ -1058,13 +1059,12 @@ rm -rf sharutils-4.15.2 tar -xf db-5.3.28.tar.gz cd db-5.3.28 sed -i 's/\(__atomic_compare_exchange\)/\1_db/' src/dbinc/atomic.h -cd build_unix -../dist/configure --prefix=/usr --enable-compat185 --enable-dbm --disable-static --enable-cxx +./dist/configure --prefix=/usr --enable-compat185 --enable-cxx --enable-dbm --disable-static make make docdir=/usr/share/doc/db install chown -R root:root /usr/bin/db_* /usr/include/db{,_185,_cxx}.h /usr/lib/libdb*.{so,la} -install -t /usr/share/licenses/db -Dm644 ../LICENSE -cd ../.. +install -t /usr/share/licenses/db -Dm644 LICENSE +cd .. rm -rf db-5.3.28 # LMDB. tar -xf LMDB_0.9.29.tar.gz @@ -2004,20 +2004,19 @@ install -t /usr/share/licenses/lzop -Dm644 COPYING cd .. rm -rf lzop-1.04 # squashfs-tools. -tar -xf squashfs-tools-4.5.tar.xz -cd squashfs-tools-4.5 +tar -xf squashfs-tools-4.5.1.tar.gz +cd squashfs-tools-4.5.1/squashfs-tools make GZIP_SUPPORT=1 XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 XATTR_SUPPORT=1 -make INSTALL_DIR=/usr/bin install -install -t /usr/share/licenses/squashfs-tools -Dm644 COPYING -cd .. -rm -rf squashfs-tools-4.5 +make INSTALL_PREFIX=/usr INSTALL_MANPAGES_DIR=/usr/share/man/man1 install +install -t /usr/share/licenses/squashfs-tools -Dm644 ../COPYING +cd ../.. +rm -rf squashfs-tools-4.5.1 # squashfuse. tar -xf squashfuse-0.1.104.tar.gz cd squashfuse-0.1.104 -./configure --prefix=/usr +./configure --prefix=/usr --disable-static LIBS="-llz4 -llzma -llzo2 -lz -lzstd" make make install -rm -f /usr/lib/libsquashfuse.a install -t /usr/include/squashfuse -Dm644 *.h install -t /usr/share/licenses/squashfuse -Dm644 LICENSE cd .. @@ -2225,14 +2224,14 @@ install -t /usr/share/licenses/brotli -Dm644 LICENSE cd .. rm -rf brotli-1.0.9 # libnghttp2. -tar -xf nghttp2-1.47.0.tar.xz -cd nghttp2-1.47.0 +tar -xf nghttp2-1.48.0.tar.xz +cd nghttp2-1.48.0 ./configure --prefix=/usr --disable-static --enable-lib-only make make install install -t /usr/share/licenses/libnghttp2 -Dm644 COPYING cd .. -rm -rf nghttp2-1.47.0 +rm -rf nghttp2-1.48.0 # curl (INITIAL BUILD; will be rebuilt later to support FAR MORE FEATURES). tar -xf curl-7.83.1.tar.xz cd curl-7.83.1 @@ -2859,10 +2858,10 @@ install -t /usr/share/licenses/nspr -Dm644 LICENSE cd ../.. rm -rf nspr-4.34 # NSS. -tar -xf nss-NSS_3_79_RTM.tar.gz -cd nss-NSS_3_79_RTM +tar -xf nss-3.80.tar.gz +cd nss-3.80/nss mkdir gyp -tar -xf ../gyp-9ecf45.tar.gz -C gyp --strip-components=1 +tar -xf ../../gyp-9ecf45.tar.gz -C gyp --strip-components=1 PATH="$PATH:$PWD/gyp" ./build.sh --target=x64 --enable-libpkix --disable-tests --opt --system-nspr --system-sqlite install -t /usr/lib -Dm755 ../dist/Release/lib/*.so install -t /usr/lib -Dm644 ../dist/Release/lib/*.chk @@ -2870,14 +2869,13 @@ install -t /usr/bin -Dm755 ../dist/Release/bin/{*util,shlibsign,signtool,signver install -t /usr/share/man/man1 -Dm644 doc/nroff/{*util,signtool,signver,ssltap}.1 install -dm755 /usr/include/nss cp -r ../dist/{public,private}/nss/* /usr/include/nss -sed pkg/pkg-config/nss.pc.in -e 's|%prefix%|/usr|g' -e 's|%libdir%|${prefix}/lib|g' -e 's|%exec_prefix%|${prefix}|g' -e 's|%includedir%|${prefix}/include/nss|g' -e "s|%NSPR_VERSION%|$(pkg-config --modversion nspr)|g" -e "s|%NSS_VERSION%|3.79.0|g" > /usr/lib/pkgconfig/nss.pc +sed pkg/pkg-config/nss.pc.in -e 's|%prefix%|/usr|g' -e 's|%libdir%|${prefix}/lib|g' -e 's|%exec_prefix%|${prefix}|g' -e 's|%includedir%|${prefix}/include/nss|g' -e "s|%NSPR_VERSION%|$(pkg-config --modversion nspr)|g" -e "s|%NSS_VERSION%|3.80.0|g" > /usr/lib/pkgconfig/nss.pc sed pkg/pkg-config/nss-config.in -e 's|@prefix@|/usr|g' -e "s|@MOD_MAJOR_VERSION@|$(pkg-config --modversion nss | cut -d. -f1)|g" -e "s|@MOD_MINOR_VERSION@|$(pkg-config --modversion nss | cut -d. -f2)|g" -e "s|@MOD_PATCH_VERSION@|$(pkg-config --modversion nss | cut -d. -f3)|g" > /usr/bin/nss-config chmod 755 /usr/bin/nss-config ln -sf ./pkcs11/p11-kit-trust.so /usr/lib/libnssckbi.so install -t /usr/share/licenses/nss -Dm644 COPYING -cd .. -rm -rf dist -rm -rf nss-NSS_3_79_RTM +cd ../.. +rm -rf nss-3.80 # Git. tar -xf git-2.36.1.tar.xz cd git-2.36.1 @@ -3026,13 +3024,13 @@ install -t /usr/share/licenses/autoconf213 -Dm644 COPYING cd .. rm -rf autoconf-2.13 # LLVM/Clang/LLD. -tar -xf llvm-14.0.5.src.tar.xz +tar -xf llvm-14.0.6.src.tar.xz mkdir -p libunwind -tar -xf libunwind-14.0.5.src.tar.xz -C libunwind --strip-components=1 -cd llvm-14.0.5.src +tar -xf libunwind-14.0.6.src.tar.xz -C libunwind --strip-components=1 +cd llvm-14.0.6.src mkdir -p tools/{clang,lld} -tar -xf ../clang-14.0.5.src.tar.xz -C tools/clang --strip-components=1 -tar -xf ../lld-14.0.5.src.tar.xz -C tools/lld --strip-components=1 +tar -xf ../clang-14.0.6.src.tar.xz -C tools/clang --strip-components=1 +tar -xf ../lld-14.0.6.src.tar.xz -C tools/lld --strip-components=1 mkdir LLVM-build; cd LLVM-build CFLAGS="$CFLAGS -flarge-source-files" CXXFLAGS="$CXXFLAGS -flarge-source-files" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=MinSizeRel -DLLVM_HOST_TRIPLE=x86_64-pc-linux-gnu -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_FFI=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_TARGETS_TO_BUILD="AMDGPU;BPF;X86" -DLLVM_BINUTILS_INCDIR=/usr/include -Wno-dev -G Ninja .. ninja -j$(nproc) @@ -3041,7 +3039,7 @@ install -t /usr/share/licenses/llvm -Dm644 ../LICENSE.TXT ln -sf llvm /usr/share/licenses/clang ln -sf llvm /usr/share/licenses/lld cd ../.. -rm -rf cmake libunwind llvm-14.0.5.src +rm -rf cmake libunwind llvm-14.0.6.src # Rust (will be uninstalled later). tar -xf rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz cd rust-1.61.0-x86_64-unknown-linux-gnu @@ -3062,8 +3060,8 @@ install -t /usr/share/licenses/js91 -Dm644 ../../extra-package-licenses/js91-lic cd ../.. rm -rf firefox-91.10.0 # Sudo. -tar -xf sudo-1.9.11p2.tar.gz -cd sudo-1.9.11p2 +tar -xf sudo-1.9.11p3.tar.gz +cd sudo-1.9.11p3 ./configure --prefix=/usr --libexecdir=/usr/lib --disable-pie --with-linux-audit --with-secure-path --with-insults --with-all-insults --with-passwd-tries=5 --with-env-editor --with-passprompt="[sudo] password for %p: " make make install @@ -3082,7 +3080,7 @@ session include system-session END install -t /usr/share/licenses/sudo -Dm644 LICENSE.md cd .. -rm -rf sudo-1.9.11p2 +rm -rf sudo-1.9.11p3 # volume-key. tar -xf volume_key-0.3.12.tar.gz cd volume_key-volume_key-0.3.12 @@ -3117,6 +3115,7 @@ rm -rf mandoc-1.14.6 tar -xf efivar-38.tar.bz2 cd efivar-38 sed '/prep :/a\\ttouch prep' -i src/Makefile +: > src/include/gcc.specs make CFLAGS="$CFLAGS" make LIBDIR=/usr/lib install install -t /usr/share/licenses/efivar -Dm644 COPYING @@ -3373,14 +3372,14 @@ install -t /usr/share/licenses/libmbim -Dm644 COPYING COPYING.LIB cd .. rm -rf libmbim-1.26.4 # libqmi. -tar -xf libqmi-1.30.6.tar.xz -cd libqmi-1.30.6 +tar -xf libqmi-1.30.8.tar.xz +cd libqmi-1.30.8 ./configure --prefix=/usr --disable-static make make install install -t /usr/share/licenses/libqmi -Dm644 COPYING COPYING.LIB cd .. -rm -rf libqmi-1.30.6 +rm -rf libqmi-1.30.8 # libwacom. tar -xf libwacom-2.2.0.tar.xz cd libwacom-2.2.0 @@ -4250,6 +4249,16 @@ make install install -t /usr/share/licenses/xf86-video-nouveau -Dm644 COPYING cd .. rm -rf xf86-video-nouveau-1.0.17 +# xf86-video-vesa. +tar -xf xf86-video-vesa-2.5.0.tar.bz2 +cd xf86-video-vesa-2.5.0 +patch -Np1 -i ../patches/xf86-video-vesa-2.5.0-upstreamfix.patch +./configure --prefix=/usr +make +make install +install -t /usr/share/licenses/xf86-video-vesa -Dm644 COPYING +cd .. +rm -rf xf86-video-vesa-2.5.0 # xf86-video-vmware. tar -xf xf86-video-vmware-13.3.0.tar.bz2 cd xf86-video-vmware-13.3.0 @@ -4526,15 +4535,15 @@ install -t /usr/share/licenses/lcms2 -Dm644 COPYING cd .. rm -rf lcms2-2.13.1 # JasPer. -tar -xf jasper-version-3.0.4.tar.gz -cd jasper-version-3.0.4 +tar -xf jasper-version-3.0.5.tar.gz +cd jasper-version-3.0.5 mkdir jasper-build; cd jasper-build cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_INSTALL_RPATH=YES -DJAS_ENABLE_DOC=NO -DJAS_ENABLE_LIBJPEG=ON -DJAS_ENABLE_OPENGL=ON -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/jasper -Dm644 ../LICENSE.txt cd ../.. -rm -rf jasper-version-3.0.4 +rm -rf jasper-version-3.0.5 # ATK. tar -xf atk-2.38.0.tar.xz cd atk-2.38.0 @@ -4772,6 +4781,7 @@ tar -xf cups-2.4.2-source.tar.gz cd cups-2.4.2 useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp groupadd -g 19 lpadmin +sed -e 8198d -e 8213d -e 8228d -e 8243d -i configure ./configure --libdir=/usr/lib --with-system-groups=lpadmin --with-docdir=/usr/share/cups/doc make make install @@ -4984,23 +4994,23 @@ install -t /usr/share/licenses/libtheora -Dm644 COPYING LICENSE cd .. rm -rf libtheora-1.1.1 # Speex. -tar -xf speex-1.2.0.tar.gz -cd speex-1.2.0 -./configure --prefix=/usr --disable-static +tar -xf speex-1.2.1.tar.gz +cd speex-1.2.1 +./configure --prefix=/usr --disable-static --enable-binaries make make install install -t /usr/share/licenses/speex -Dm644 COPYING cd .. -rm -rf speex-1.2.0 +rm -rf speex-1.2.1 # SpeexDSP. -tar -xf speexdsp-1.2.0.tar.gz -cd speexdsp-1.2.0 +tar -xf speexdsp-1.2.1.tar.gz +cd speexdsp-1.2.1 ./configure --prefix=/usr --disable-static make make install install -t /usr/share/licenses/speexdsp -Dm644 COPYING cd .. -rm -rf speexdsp-1.2.0 +rm -rf speexdsp-1.2.1 # Opus. tar -xf opus-1.3.1.tar.gz cd opus-1.3.1 @@ -5047,14 +5057,14 @@ install -t /usr/share/licenses/jack2 -Dm644 COPYING cd .. rm -rf jack2-1.9.21 # SBC. -tar -xf sbc-1.5.tar.xz -cd sbc-1.5 +tar -xf sbc-2.0.tar.xz +cd sbc-2.0 ./configure --prefix=/usr --disable-static make make install install -t /usr/share/licenses/sbc -Dm644 COPYING COPYING.LIB cd .. -rm -rf sbc-1.5 +rm -rf sbc-2.0 # ldac. tar -xf ldacBT-2.0.2.3.tar.gz cd ldacBT @@ -5116,8 +5126,8 @@ install -t /usr/share/licenses/orc -Dm644 ../COPYING cd ../.. rm -rf orc-0.4.32 # PulseAudio. -tar -xf pulseaudio-16.0.tar.xz -cd pulseaudio-16.0 +tar -xf pulseaudio-16.1.tar.xz +cd pulseaudio-16.1 mkdir pulse-build; cd pulse-build meson --prefix=/usr --buildtype=minsize -Ddatabase=gdbm -Ddoxygen=false .. ninja @@ -5125,7 +5135,7 @@ ninja install rm -f /etc/dbus-1/system.d/pulseaudio-system.conf install -t /usr/share/licenses/pulseaudio -Dm644 ../LICENSE ../GPL ../LGPL cd ../.. -rm -rf pulseaudio-16.0 +rm -rf pulseaudio-16.1 # SDL (rebuild to support pulseaudio). tar -xf SDL-1.2.15.tar.gz cd SDL-1.2.15 @@ -5138,12 +5148,12 @@ rm -rf SDL-1.2.15 # SDL2. tar -xf SDL2-2.0.22.tar.gz cd SDL2-2.0.22 -./configure --prefix=/usr -make -make install -rm -f /usr/lib/libSDL2*.a -install -t /usr/share/licenses/sdl2 -Dm644 LICENSE.txt -cd .. +mkdir SDL2-build; cd SDL2-build +cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=MinSizeRel -DSDL_RPATH=OFF -DSDL_STATIC=OFF -Wno-dev -G Ninja .. +ninja +ninja install +install -t /usr/share/licenses/sdl2 -Dm644 ../LICENSE.txt +cd ../.. rm -rf SDL2-2.0.22 # dmidecode. tar -xf dmidecode-3.3.tar.xz @@ -5620,15 +5630,15 @@ install -t /usr/share/licenses/mupdf -Dm644 COPYING COPYING.LESSER cd .. rm -rf libimobiledevice-1.3.0 # JSON (required by smblient 4.16+). -tar -xf JSON-4.06.tar.gz -cd JSON-4.06 +tar -xf JSON-4.07.tar.gz +cd JSON-4.07 perl Makefile.PL make make install install -dm755 /usr/share/licenses/json cat lib/JSON.pm | tail -n9 | head -n6 > /usr/share/licenses/json/COPYING cd .. -rm -rf JSON-4.06 +rm -rf JSON-4.07 # Parse-Yapp. tar -xf Parse-Yapp-1.21.tar.gz cd Parse-Yapp-1.21 @@ -6386,17 +6396,8 @@ END install -t /usr/share/licenses/xdg-desktop-portal-gtk -Dm644 COPYING cd .. rm -rf xdg-desktop-portal-gtk-1.14.0 -# WebKitGTK. -tar -xf webkitgtk-2.36.3.tar.xz -cd webkitgtk-2.36.3 -mkdir webkitgtk-build; cd webkitgtk-build -cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON -DPORT=GTK -DLIB_INSTALL_DIR=/usr/lib -DENABLE_GAMEPAD=OFF -DENABLE_GLES2=ON -DENABLE_GTKDOC=ON -DENABLE_MINIBROWSER=ON -DUSE_LIBHYPHEN=OFF -DUSE_SOUP2=ON -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON -Wno-dev -G Ninja .. -ninja -j$(nproc) -ninja install -install -dm755 /usr/share/licenses/webkitgtk -find ../Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z | while IFS= read -d $'\0' -r _f; do echo "### $_f ###"; cat "$_f"; echo; done > /usr/share/licenses/webkitgtk/LICENSE -cd ../.. -rm -rf webkitgtk-2.36.3 +# WebKitGTK (precompiled, see https://github.com/MassOS-Linux/webkitgtk-binaries for the reasons why). +tar --no-same-owner -xf webkitgtk-2.36.3-MassOS2022.06-icu71.1-x86_64.tar.xz -C / # Cogl. tar -xf cogl-1.22.8.tar.xz cd cogl-1.22.8 @@ -7006,7 +7007,7 @@ plymouth-set-default-theme bgrt cd .. rm -rf plymouth-0.9.5 # Firefox. -tar --no-same-owner -xf firefox-101.0.tar.bz2 -C /usr/lib +tar --no-same-owner -xf firefox-101.0.1.tar.bz2 -C /usr/lib mkdir -p /usr/lib/firefox/distribution cat > /usr/lib/firefox/distribution/policies.json << END { @@ -7076,8 +7077,8 @@ install -t /usr/share/licenses/busybox -Dm644 LICENSE cd .. rm -rf busybox-1.35.0 # Linux Kernel. -tar -xf linux-5.18.5.tar.xz -cd linux-5.18.5 +tar -xf linux-5.18.7.tar.xz +cd linux-5.18.7 cp ../kernel-config .config make olddefconfig make @@ -7113,7 +7114,7 @@ find "$builddir" -type f -name '*.o' -delete ln -sr "$builddir" "/usr/src/linux" install -t /usr/share/licenses/linux -Dm644 COPYING LICENSES/exceptions/* LICENSES/preferred/* cd .. -rm -rf linux-5.18.5 +rm -rf linux-5.18.7 unset builddir # NVIDIA Open kernel modules. tar -xf open-gpu-kernel-modules-515.43.04.tar.gz @@ -7156,14 +7157,19 @@ if [ "$(readlink /usr/sbin/httpd)" = "/usr/bin/busybox" ]; then rm -f /usr/sbin/ # Remove Debian stuff. rm -rf /etc/kernel # Move any misplaced files. -cp -r /usr/etc / -rm -rf /usr/etc -cp -r /usr/man /usr/share -rm -rf /usr/man +if [ -d /usr/etc ]; then + cp -r /usr/etc / + rm -rf /usr/etc +fi +if [ -d /usr/man ]; then + cp -r /usr/man /usr/share + rm -rf /usr/man +fi # Remove static documentation to free up space. rm -rf /usr/share/doc/* rm -rf /usr/doc rm -rf /usr/docs +rm -rf /usr/share/gtk-doc/html/* # Remove temporary compiler from stage1. find /usr -depth -name $(uname -m)-massos-linux-gnu\* | xargs rm -rf # Remove libtool archives. diff --git a/changelog.md b/changelog.md index a03e518..6455daf 100644 --- a/changelog.md +++ b/changelog.md @@ -19,21 +19,25 @@ Upgraded software: - DirectX-Headers: `1.600.10 --> 1.602.0` - Exo: `4.17.1 --> 4.17.2` - File: `5.41 --> 5.42` +- Firefox: `101.0 --> 101.0.1` - glslang: `11.9.0 --> 11.10.0` - Graphviz: `3.0.0 --> 4.0.0` - htop: `3.1.2 --> 3.2.1` - hwdata: `0.359 --> 0.360` - ISO-Codes: `4.9.0 --> 4.10.0` -- JasPer: `3.0.3 --> 3.0.4` +- JasPer: `3.0.3 --> 3.0.5` +- JSON: `4.06 --> 4.07` - kbd: `2.4.0 --> 2.5.1` - libdrm: `2.4.110 --> 2.4.111` - libinput: `1.20.1 --> 1.21.0` +- libnghttp2: `1.47.0 --> 1.48.0` - libnma: `1.8.38 --> 1.8.40` - libostree: `2022.3 --> 2022.4` +- libqmi: `1.30.6 --> 1.30.8` - librsvg: `2.54.3 --> 2.54.4` - libX11: `1.8 --> 1.8.1` -- Linux Kernel: `5.18.1 --> 5.18.5` -- LLVM/Clang/LLD: `14.0.4 --> 14.0.5` +- Linux Kernel: `5.18.1 --> 5.18.7` +- LLVM/Clang/LLD: `14.0.4 --> 14.0.6` - lxml: `4.8.0 --> 4.9.0` - Mesa: `22.1.0 --> 22.1.2` - Meson: `0.62.1 --> 0.62.2` @@ -42,13 +46,20 @@ Upgraded software: - Nettle: `3.7.3 --> 3.8` - network-manager-applet: `1.26.0 --> 1.28.0` - NetworkManager: `1.38.0 --> 1.38.2` +- NSS: `3.79 --> 3.80` - ntfs-3g: `2021.8.22 --> 2022.5.17` +- OpenSSL: `3.0.3 --> 3.0.4` - PipeWire: `0.3.51 --> 0.3.52` - Poppler: `22.05.0 --> 22.06.0` +- PulseAudio: `16.0 --> 16.1` - Python: `3.10.4 --> 3.10.5` +- SBC: `1.5 --> 2.0` - smbclient: `4.16.1 --> 4.16.2` +- Speex: `1.2.0 --> 1.2.1` +- SpeexDSP: `1.2.0 --> 1.2.1` - SPIRV-Headers: `1.3.204.1 --> 1.3.216.0` -- Sudo: `1.9.10 --> 1.9.11p2` +- squashfs-tools: `4.5 --> 4.5.1` +- Sudo: `1.9.10 --> 1.9.11p3` - systemd: `251.1 --> 251.2` - Thunderbird: `91.9.1 --> 91.10.0` - UPower: `0.99.18 --> 0.99.19` diff --git a/patches/xf86-video-vesa-2.5.0-upstreamfix.patch b/patches/xf86-video-vesa-2.5.0-upstreamfix.patch new file mode 100644 index 0000000..3b0649b --- /dev/null +++ b/patches/xf86-video-vesa-2.5.0-upstreamfix.patch @@ -0,0 +1,91 @@ +From 3ccf80b5626c06f12e8d0a5779d4f6b3721d518f Mon Sep 17 00:00:00 2001 +From: Jocelyn Falempe +Date: Thu, 14 Apr 2022 14:39:37 +0200 +Subject: [PATCH] Refuse to run if framebuffer or dri devices are present + +The simpledrm driver, introduced in kernel 5.14, +can replace efifb to provide the efi framebuffer. + +This fixes a bug on Fedora 36 (first version to use simpledrm driver): +https://bugzilla.redhat.com/show_bug.cgi?id=2074789 + +v2: check for framebuffer or dri devices instead of efi framebuffer interface. + +Reviewed-by: Adam Jackson +Reviewed-by: Javier Martinez Canillas +Signed-off-by: Jocelyn Falempe +--- + src/vesa.c | 39 ++++++++++++++++++++++++++++++++++----- + 1 file changed, 34 insertions(+), 5 deletions(-) + +diff --git a/src/vesa.c b/src/vesa.c +index b2a1922..ed2227d 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -44,6 +44,7 @@ + + #include + #include ++#include + #include "vesa.h" + + /* All drivers initialising the SW cursor need this */ +@@ -439,12 +440,40 @@ VESAInitScrn(ScrnInfoPtr pScrn) + pScrn->FreeScreen = VESAFreeScreen; + } + ++#ifdef XSERVER_LIBPCIACCESS ++#ifdef __linux__ ++/* ++ * check if a file exist in directory ++ * should be equivalent to a glob ${directory}/${prefix}* ++ */ ++ ++static Bool ++VESAFileExistsPrefix(const char *directory, const char *prefix) { ++ DIR *dir; ++ struct dirent *entry; ++ Bool found = FALSE; ++ int len = strlen(prefix); ++ ++ dir = opendir(directory); ++ if (!dir) ++ return FALSE; ++ ++ while ((entry = readdir(dir)) != NULL) { ++ if (strlen(entry->d_name) > len && ++ !memcmp(entry->d_name, prefix, len)) { ++ found = TRUE; ++ break; ++ } ++ } ++ closedir(dir); ++ return found; ++} ++#endif ++ + /* + * This function is called once, at the start of the first server generation to + * do a minimal probe for supported hardware. + */ +- +-#ifdef XSERVER_LIBPCIACCESS + static Bool + VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + intptr_t match_data) +@@ -452,9 +481,9 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + ScrnInfoPtr pScrn; + + #ifdef __linux__ +- if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0 || +- access("/sys/devices/platform/efifb.0", F_OK) == 0) { +- ErrorF("vesa: Refusing to run on UEFI\n"); ++ if (VESAFileExistsPrefix("/dev", "fb") || ++ VESAFileExistsPrefix("/dev/dri", "card")) { ++ ErrorF("vesa: Refusing to run, Framebuffer or dri device present\n"); + return FALSE; + } + #endif +-- +GitLab + diff --git a/source-urls b/source-urls index 757d823..6b813a9 100644 --- a/source-urls +++ b/source-urls @@ -47,7 +47,7 @@ https://deb.debian.org/debian/pool/main/c/cdrkit/cdrkit_1.1.11.orig.tar.gz https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz https://files.pythonhosted.org/packages/source/c/chardet/chardet-4.0.0.tar.gz https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/clang-14.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang-14.0.6.src.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter/1.26/clutter-1.26.4.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2.tar.gz @@ -112,11 +112,11 @@ https://github.com/knik0/faad2/archive/2_10_0/faad2-2_10_0.tar.gz https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.29.orig.tar.gz https://github.com/yo8192/fcron/archive/ver3_3_1/fcron-ver3_3_1.tar.gz https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz -https://archive-4.kali.org/kali/pool/main/f/figlet/figlet_2.2.5.orig.tar.gz +https://deb.debian.org/debian/pool/main/f/figlet/figlet_2.2.5.orig.tar.gz https://astron.com/pub/file/file-5.42.tar.gz https://mirror.lyrahosting.com/gnu/findutils/findutils-4.9.0.tar.xz https://archive.mozilla.org/pub/firefox/releases/91.10.0esr/source/firefox-91.10.0esr.source.tar.xz -https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/en-US/firefox-101.0.tar.bz2 +https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/en-US/firefox-101.0.1.tar.bz2 https://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz https://github.com/flatpak/flatpak/releases/download/1.13.2/flatpak-1.13.2.tar.xz https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz @@ -207,9 +207,9 @@ https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.10.0/iso-codes-v4 https://archive.massos.org/sources/itstool-2.0.7.tar.bz2 https://github.com/jackaudio/jack2/archive/v1.9.21/jack2-1.9.21.tar.gz https://digip.org/jansson/releases/jansson-2.13.1.tar.gz -https://github.com/jasper-software/jasper/archive/version-3.0.4/jasper-version-3.0.4.tar.gz +https://github.com/jasper-software/jasper/archive/version-3.0.5/jasper-version-3.0.5.tar.gz https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-3.1.1.tar.gz -https://www.cpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.06.tar.gz +https://www.cpan.org/authors/id/I/IS/ISHIGAKI/JSON-4.07.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz https://github.com/open-source-parsers/jsoncpp/archive/1.9.5/jsoncpp-1.9.5.tar.gz @@ -226,18 +226,18 @@ https://pagure.io/libaio/archive/libaio-0.3.113/libaio-libaio-0.3.113.tar.gz https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6.1.tar.xz https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2 -https://archive-4.kali.org/kali/pool/main/liba/libatasmart/libatasmart_0.19.orig.tar.xz +https://deb.debian.org/debian/pool/main/liba/libatasmart/libatasmart_0.19.orig.tar.xz http://mirror.lyrahosting.com/gentoo/distfiles/libavc1394-0.5.4.tar.gz https://github.com/storaged-project/libblockdev/releases/download/2.27-1/libblockdev-2.27.tar.gz https://videolan.mirrors.nublue.co.uk/libbluray/1.3.0/libbluray-1.3.0.tar.bz2 https://files.libburnia-project.org/releases/libburn-1.5.4.tar.gz https://github.com/storaged-project/libbytesize/releases/download/2.7/libbytesize-2.7.tar.gz -https://archive-4.kali.org/kali/pool/main/libc/libcanberra/libcanberra_0.30.orig.tar.xz +https://deb.debian.org/debian/pool/main/libc/libcanberra/libcanberra_0.30.orig.tar.xz https://cdn.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.64.tar.xz https://mirror.lyrahosting.com/gnu/libcdio/libcdio-2.1.0.tar.bz2 https://mirror.lyrahosting.com/gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2 https://ftp.acc.umu.se/pub/gnome/sources/libchamplain/0.12/libchamplain-0.12.20.tar.xz -https://archive-4.kali.org/kali/pool/main/libd/libdaemon/libdaemon_0.14.orig.tar.gz +https://deb.debian.org/debian/pool/main/libd/libdaemon/libdaemon_0.14.orig.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/libdazzle/3.44/libdazzle-3.44.0.tar.xz https://www.x.org/archive/individual/lib/libdmx-1.1.4.tar.bz2 https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz @@ -297,7 +297,7 @@ https://archive.massos.org/sources/libpng-1.6.37.tar.xz https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2 -https://www.freedesktop.org/software/libqmi/libqmi-1.30.6.tar.xz +https://www.freedesktop.org/software/libqmi/libqmi-1.30.8.tar.xz https://www.libraw.org/data/LibRaw-0.20.2.tar.gz https://cdn.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.54/librsvg-2.54.4.tar.xz @@ -320,7 +320,7 @@ https://mirror.lyrahosting.com/gnu/libtool/libtool-2.4.7.tar.xz https://github.com/stefanberger/libtpms/archive/v0.9.2/libtpms-0.9.2.tar.gz https://mirror.lyrahosting.com/gnu/libunistring/libunistring-1.0.tar.xz https://de.freedif.org/savannah/libunwind/libunwind-1.6.2.tar.gz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/libunwind-14.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/libunwind-14.0.6.src.tar.xz https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.1.tar.bz2 https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2 @@ -372,10 +372,10 @@ https://www.x.org/archive/individual/lib/libXxf86vm-1.1.4.tar.bz2 https://libzip.org/download/libzip-1.8.0.tar.xz https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz -https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.5.tar.xz +https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.7.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/lld-14.0.5.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.5/llvm-14.0.5.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/lld-14.0.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-14.0.6.src.tar.xz https://github.com/lm-sensors/lm-sensors/archive/V3-6-0/lm-sensors-3-6-0.tar.gz https://github.com/LMDB/lmdb/archive/LMDB_0.9.29.tar.gz https://www.cpan.org/authors/id/P/PV/PVANDRY/Locale-gettext-1.07.tar.gz @@ -430,12 +430,12 @@ https://ftp.acc.umu.se/pub/gnome/sources/network-manager-applet/1.28/network-man https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager/1.38/NetworkManager-1.38.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.18.tar.xz https://releases.pagure.org/newt/newt-0.52.21.tar.gz -https://github.com/nghttp2/nghttp2/releases/download/v1.47.0/nghttp2-1.47.0.tar.xz +https://github.com/nghttp2/nghttp2/releases/download/v1.48.0/nghttp2-1.48.0.tar.xz https://github.com/ninja-build/ninja/archive/v1.11.0/ninja-1.11.0.tar.gz https://gitlab.com/TheSonicMaster/noto-fonts-tarball/-/raw/3/noto-fonts3.tar.xz https://www.gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2 https://archive.mozilla.org/pub/nspr/releases/v4.34/src/nspr-4.34.tar.gz -https://github.com/nss-dev/nss/archive/NSS_3_79_RTM/nss-NSS_3_79_RTM.tar.gz +https://archive.mozilla.org/pub/security/nss/releases/NSS_3_80_RTM/src/nss-3.80.tar.gz https://github.com/tuxera/ntfs-3g/archive/2022.5.17/ntfs-3g-2022.5.17.tar.gz https://github.com/NVIDIA/open-gpu-kernel-modules/archive/515.43.04/open-gpu-kernel-modules-515.43.04.tar.gz https://github.com/kcat/openal-soft/archive/1.21.1/openal-soft-1.21.1.tar.gz @@ -445,7 +445,7 @@ https://github.com/uclouvain/openjpeg/archive/v2.5.0/openjpeg-2.5.0.tar.gz https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.2.tgz https://archive.massos.org/sources/OpenSP-1.5.2.tar.gz https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.0p1.tar.gz -https://www.openssl.org/source/openssl-3.0.3.tar.gz +https://www.openssl.org/source/openssl-3.0.4.tar.gz https://github.com/OpenVPN/openvpn/archive/v2.5.7/openvpn-2.5.7.tar.gz https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz https://mirror.netcologne.de/xfce/src/apps/orage/4.16/orage-4.16.0.tar.bz2 @@ -487,7 +487,7 @@ https://archive.massos.org/sources/ppp-2.4.9-extra-files.tar.xz https://gitlab.com/procps-ng/procps/-/archive/v4.0.0/procps-v4.0.0.tar.bz2 https://gitlab.com/psmisc/psmisc/-/archive/v23.5/psmisc-v23.5.tar.bz2 https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-0.7.0.tar.gz -https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz +https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-16.1.tar.xz https://mirror.lyrahosting.com/gentoo/distfiles/pv-1.6.20.tar.bz2 https://github.com/pygobject/pycairo/releases/download/v1.21.0/pycairo-1.21.0.tar.gz https://github.com/eliben/pycparser/archive/release_v2.21/pycparser-release_v2.21.tar.gz @@ -512,7 +512,7 @@ https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.xz https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz https://download.samba.org/pub/samba/stable/samba-4.16.2.tar.gz https://github.com/sass/sassc/archive/3.6.2/sassc-3.6.2.tar.gz -https://cdn.kernel.org/pub/linux/bluetooth/sbc-1.5.tar.xz +https://cdn.kernel.org/pub/linux/bluetooth/sbc-2.0.tar.xz https://www.libsdl.org/release/SDL-1.2.15.tar.gz https://www.libsdl.org/release/SDL2-2.0.22.tar.gz https://mirror.lyrahosting.com/gnu/sed/sed-4.8.tar.xz @@ -533,17 +533,17 @@ https://github.com/leohemsted/smartypants.py/archive/v2.0.1/smartypants.py-2.0.1 https://www.x.org/archive/individual/app/smproxy-1.0.6.tar.bz2 https://github.com/snowballstem/snowball/archive/v2.2.0/snowball-2.2.0.tar.gz https://www.surina.net/soundtouch/soundtouch-2.3.1.tar.gz -https://downloads.xiph.org/releases/speex/speex-1.2.0.tar.gz -https://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz +https://downloads.xiph.org/releases/speex/speex-1.2.1.tar.gz +https://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz https://archive.massos.org/workdev/sphinx-4.5.0-x86_64-venv.tar.xz https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.216.0/SPIRV-Headers-sdk-1.3.216.0.tar.gz https://github.com/KhronosGroup/SPIRV-Tools/archive/v2022.2/SPIRV-Tools-2022.2.tar.gz https://sqlite.org/2022/sqlite-autoconf-3380500.tar.gz -https://archive.massos.org/sources/squashfs-tools-4.5.tar.xz +https://github.com/plougher/squashfs-tools/archive/4.5.1/squashfs-tools-4.5.1.tar.gz https://github.com/vasi/squashfuse/releases/download/0.1.104/squashfuse-0.1.104.tar.gz https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.3/sshfs-3.7.3.tar.xz https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz -https://www.sudo.ws/sudo/dist/sudo-1.9.11p2.tar.gz +https://www.sudo.ws/sudo/dist/sudo-1.9.11p3.tar.gz https://archive.massos.org/sources/swig-4.0.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz @@ -586,7 +586,7 @@ https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.3.217/Vulkan-Loader-1.3 https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.3.217/Vulkan-Tools-1.3.217.tar.gz https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz https://wayland.freedesktop.org/releases/wayland-protocols-1.25.tar.xz -https://webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz +https://github.com/MassOS-Linux/webkitgtk-binaries/releases/download/2.36.3-MassOS2022.06-icu71.1/webkitgtk-2.36.3-MassOS2022.06-icu71.1-x86_64.tar.xz https://mirror.lyrahosting.com/gnu/wget/wget-1.21.3.tar.gz https://mirror.lyrahosting.com/gnu/which/which-2.21.tar.gz https://github.com/rfc1036/whois/archive/v5.5.13/whois-5.5.13.tar.gz @@ -629,6 +629,7 @@ https://www.x.org/archive/individual/driver/xf86-video-ati-19.1.0.tar.bz2 https://www.x.org/archive/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 https://archive.massos.org/sources/xf86-video-intel-20211007.tar.xz https://www.x.org/archive/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2 +https://www.x.org/archive/individual/driver/xf86-video-vesa-2.5.0.tar.bz2 https://www.x.org/archive/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 https://mirror.netcologne.de/xfce/src/apps/xfburn/0.6/xfburn-0.6.2.tar.bz2 https://mirror.netcologne.de/xfce/src/xfce/xfce4-appfinder/4.17/xfce4-appfinder-4.17.0.tar.bz2 diff --git a/stage1.sh b/stage1.sh index 48f6ff9..2f21065 100755 --- a/stage1.sh +++ b/stage1.sh @@ -72,14 +72,14 @@ cat gcc/limitx.h gcc/glimits.h gcc/limity.h > `dirname $($MASSOS_TARGET-gcc -pri cd .. rm -rf gcc-12.1.0 # Linux API Headers. -tar -xf linux-5.18.5.tar.xz -cd linux-5.18.5 +tar -xf linux-5.18.7.tar.xz +cd linux-5.18.7 make headers find usr/include -name '.*' -delete rm usr/include/Makefile cp -r usr/include "$MASSOS"/usr cd .. -rm -rf linux-5.18.5 +rm -rf linux-5.18.7 # Glibc tar -xf glibc-2.35.tar.xz cd glibc-2.35 diff --git a/utils/build-configs/kernel-config b/utils/build-configs/kernel-config index b86d9d3..e73ca75 100644 --- a/utils/build-configs/kernel-config +++ b/utils/build-configs/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.5 Kernel Configuration +# Linux/x86 5.18.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (MassOS GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -197,6 +197,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -10672,6 +10674,7 @@ CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y From c8fd3b5ba805be58685d1ed3dda2eff3ce0dc549 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Tue, 28 Jun 2022 21:54:49 +0100 Subject: [PATCH 23/32] Add power-profiles-daemon --- build-system.sh | 10 ++++++++++ source-urls | 1 + utils/builtins | 2 ++ 3 files changed, 13 insertions(+) diff --git a/build-system.sh b/build-system.sh index fd2a807..dedcadc 100755 --- a/build-system.sh +++ b/build-system.sh @@ -5724,6 +5724,16 @@ install -t /usr/share/licenses/upower -Dm644 ../COPYING systemctl enable upower cd ../.. rm -rf upower-v0.99.19 +# power-profiles-daemon. +tar -xf power-profiles-daemon-0.12.tar.bz2 +cd power-profiles-daemon-0.12 +mkdir build; cd build +meson --prefix=/usr --buildtype=minsize .. +ninja +ninja install +install -t /usr/share/licenses/power-profiles-daemon -Dm644 ../COPYING +cd ../.. +rm -rf power-profiles-daemon-0.12 # NetworkManager. tar -xf NetworkManager-1.38.2.tar.xz cd NetworkManager-1.38.2 diff --git a/source-urls b/source-urls index 6b813a9..e657840 100644 --- a/source-urls +++ b/source-urls @@ -482,6 +482,7 @@ https://poppler.freedesktop.org/poppler-22.06.0.tar.xz https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz https://archive.massos.org/sources/popsicle-1.3.0-54-ga1561b3.tar.xz https://github.com/rpm-software-management/popt/archive/refs/tags/popt-1.18-release.tar.gz +https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/0.12/power-profiles-daemon-0.12.tar.bz2 https://download.samba.org/pub/ppp/ppp-2.4.9.tar.gz https://archive.massos.org/sources/ppp-2.4.9-extra-files.tar.xz https://gitlab.com/procps-ng/procps/-/archive/v4.0.0/procps-v4.0.0.tar.bz2 diff --git a/utils/builtins b/utils/builtins index f80518d..356a482 100644 --- a/utils/builtins +++ b/utils/builtins @@ -464,6 +464,7 @@ polkit-gnome poppler popsicle popt +power-profiles-daemon ppp procps-ng psmisc @@ -559,6 +560,7 @@ volume-key vte vulkan-headers vulkan-loader +vulkan-tools wayland wayland-protocols webkitgtk From f1447e9b5a21a76e2a5bdefb58a0eb73c444d707 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 29 Jun 2022 12:42:53 +0100 Subject: [PATCH 24/32] Disable installing tests Saves about 22MB of space which was consumed for no obvious benefit. --- build-system.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-system.sh b/build-system.sh index dedcadc..acbd9e7 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3095,7 +3095,7 @@ rm -rf volume_key-volume_key-0.3.12 tar -xf json-glib-1.6.6.tar.xz cd json-glib-1.6.6 mkdir json-build; cd json-build -meson --prefix=/usr --buildtype=minsize .. +meson --prefix=/usr --buildtype=minsize -Dman=true -Dtests=false .. ninja ninja install install -t /usr/share/licenses/json-glib -Dm644 ../COPYING @@ -4568,7 +4568,7 @@ rm -rf atkmm-2.28.2 tar -xf gdk-pixbuf-2.42.8.tar.xz cd gdk-pixbuf-2.42.8 mkdir pixbuf-build; cd pixbuf-build -meson --prefix=/usr --buildtype=minsize .. +meson --prefix=/usr --buildtype=minsize -Dinstalled_tests=false .. ninja ninja install gdk-pixbuf-query-loaders --update-cache @@ -5893,7 +5893,7 @@ rm -rf libostree-2022.4 tar -xf libxmlb-0.3.6.tar.gz cd libxmlb-0.3.6 mkdir xmlb-build; cd xmlb-build -meson --prefix=/usr --buildtype=minsize -Dstemmer=true .. +meson --prefix=/usr --buildtype=minsize -Dstemmer=true -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libxmlb -Dm644 ../LICENSE From 320590fa116621f54767e851dc0fc0b60bdf224b Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Wed, 29 Jun 2022 18:58:40 +0100 Subject: [PATCH 25/32] Package updates and build fixes --- build-system.sh | 118 +- changelog.md | 14 +- patches/hplip-3.21.12-fix_too_many_bugs.patch | 1903 ----------------- patches/hplip-3.22.6-manyfixes.patch | 865 ++++++++ source-urls | 24 +- stage1.sh | 6 +- utils/build-configs/kernel-config | 2 +- 7 files changed, 952 insertions(+), 1980 deletions(-) delete mode 100644 patches/hplip-3.21.12-fix_too_many_bugs.patch create mode 100644 patches/hplip-3.22.6-manyfixes.patch diff --git a/build-system.sh b/build-system.sh index acbd9e7..f4d061a 100755 --- a/build-system.sh +++ b/build-system.sh @@ -965,6 +965,7 @@ make install mv /usr/bin/chroot /usr/sbin mv /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8 sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8 +dircolors -p > /etc/dircolors install -t /usr/share/licenses/coreutils -Dm644 COPYING cd .. rm -rf coreutils-9.1 @@ -2012,15 +2013,16 @@ install -t /usr/share/licenses/squashfs-tools -Dm644 ../COPYING cd ../.. rm -rf squashfs-tools-4.5.1 # squashfuse. -tar -xf squashfuse-0.1.104.tar.gz -cd squashfuse-0.1.104 -./configure --prefix=/usr --disable-static LIBS="-llz4 -llzma -llzo2 -lz -lzstd" +tar -xf squashfuse-0.1.105.tar.gz +cd squashfuse-0.1.105 +./autogen.sh +./configure --prefix=/usr --disable-static make make install install -t /usr/include/squashfuse -Dm644 *.h install -t /usr/share/licenses/squashfuse -Dm644 LICENSE cd .. -rm -rf squashfuse-0.1.104 +rm -rf squashfuse-0.1.105 # libaio. tar -xf libaio-libaio-0.3.113.tar.gz cd libaio-libaio-0.3.113 @@ -2051,6 +2053,8 @@ rm -rf thin-provisioning-tools-0.9.0 # LVM2. tar -xf LVM2.2.03.16.tgz cd LVM2.2.03.16 +sed -i 201,202d configure.ac +autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-cmdlib --enable-dmeventd --enable-lvmpolld --enable-pkgconfig --enable-readline --enable-udev_rules --enable-udev_sync make make install @@ -2233,14 +2237,14 @@ install -t /usr/share/licenses/libnghttp2 -Dm644 COPYING cd .. rm -rf nghttp2-1.48.0 # curl (INITIAL BUILD; will be rebuilt later to support FAR MORE FEATURES). -tar -xf curl-7.83.1.tar.xz -cd curl-7.83.1 +tar -xf curl-7.84.0.tar.xz +cd curl-7.84.0 ./configure --prefix=/usr --disable-static --with-openssl --enable-threaded-resolver --with-ca-path=/etc/ssl/certs make make install install -t /usr/share/licenses/curl -Dm644 COPYING cd .. -rm -rf curl-7.83.1 +rm -rf curl-7.84.0 # jsoncpp. tar -xf jsoncpp-1.9.5.tar.gz cd jsoncpp-1.9.5 @@ -2600,13 +2604,13 @@ install -t /usr/share/licenses/rtmpdump -Dm644 COPYING cd .. rm -rf rtmpdump-2.4-20210219-gf1b83c1 # curl (rebuild to support more features). -tar -xf curl-7.83.1.tar.xz -cd curl-7.83.1 +tar -xf curl-7.84.0.tar.xz +cd curl-7.84.0 ./configure --prefix=/usr --disable-static --with-openssl --with-libssh2 --with-gssapi --enable-ares --enable-threaded-resolver --with-ca-path=/etc/ssl/certs make make install cd .. -rm -rf curl-7.83.1 +rm -rf curl-7.84.0 # OpenVPN. tar -xf openvpn-2.5.7.tar.gz cd openvpn-2.5.7 @@ -2655,8 +2659,8 @@ install -t /usr/share/licenses/gpgme -Dm644 COPYING COPYING.LESSER LICENSES cd .. rm -rf gpgme-1.17.1 # SQLite. -tar -xf sqlite-autoconf-3380500.tar.gz -cd sqlite-autoconf-3380500 +tar -xf sqlite-autoconf-3390000.tar.gz +cd sqlite-autoconf-3390000 CPPFLAGS="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_FTS3_TOKENIZER=1" ./configure --prefix=/usr --disable-static --enable-fts5 make make install @@ -2666,7 +2670,7 @@ The code and documentation of SQLite is dedicated to the public domain. See https://www.sqlite.org/copyright.html for more information. END cd .. -rm -rf sqlite-autoconf-3380500 +rm -rf sqlite-autoconf-3390000 # Cyrus SASL (rebuild to support krb5 and OpenLDAP). tar -xf cyrus-sasl-2.1.28.tar.gz cd cyrus-sasl-2.1.28 @@ -2708,7 +2712,9 @@ cd audit-userspace-3.0.8 patch -Np1 -i ../patches/audit-3.0.7-WorkaroundBuildIssue.patch ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-gssapi-krb5=yes --enable-systemd=yes -make +ACFLAGS="-D_REENTRANT -D_GNU_SOURCE" ALDFLAGS="-Wl,-z,relro,-z,now" +make auditd_CFLAGS="$ACFLAGS -fno-strict-aliasing -pthread" auditctl_CFLAGS="$ACFLAGS" audisp_remote_CFLAGS="$ACFLAGS" audisp_syslog_CFLAGS="$ACFLAGS" audispd_zos_remote_CFLAGS="$ACFLAGS" auditd_LDFLAGS="$ALDFLAGS" auditctl_LDFLAGS="$ALDFLAGS" audispd-zos-remote_LDFLAGS="$ALDFLAGS" audisp_remote_LDFLAGS="$ALDFLAGS" audisp_syslog_LDFLAGS="$ALDFLAGS" +unset ACFLAGS ALDFLAGS make install sed -i 's|"audit.h"||' /usr/include/libaudit.h install -dm0700 /var/log/audit @@ -2877,8 +2883,8 @@ install -t /usr/share/licenses/nss -Dm644 COPYING cd ../.. rm -rf nss-3.80 # Git. -tar -xf git-2.36.1.tar.xz -cd git-2.36.1 +tar -xf git-2.37.0.tar.xz +cd git-2.37.0 ./configure --prefix=/usr --with-gitconfig=/etc/gitconfig --with-python=python3 --with-libpcre2 make make man @@ -2886,7 +2892,7 @@ make perllibdir=/usr/lib/perl5/5.36/site_perl install make install-man install -t /usr/share/licenses/git -Dm644 COPYING LGPL-2.1 cd .. -rm -rf git-2.36.1 +rm -rf git-2.37.0 # libstemmer. tar -xf snowball-2.2.0.tar.gz cd snowball-2.2.0 @@ -3047,8 +3053,8 @@ cd rust-1.61.0-x86_64-unknown-linux-gnu cd .. rm -rf rust-1.61.0-x86_64-unknown-linux-gnu # JS91. -tar -xf firefox-91.10.0esr.source.tar.xz -cd firefox-91.10.0 +tar -xf firefox-91.11.0esr.source.tar.xz +cd firefox-91.11.0 chmod +x js/src/configure.in mkdir JS91-build; cd JS91-build SHELL=/bin/sh ../js/src/configure.in --prefix=/usr --enable-linker=lld --with-intl-api --with-system-zlib --with-system-icu --disable-jemalloc --disable-debug-symbols --enable-readline @@ -3058,7 +3064,7 @@ rm -f /usr/lib/libjs_static.ajs sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js91-config install -t /usr/share/licenses/js91 -Dm644 ../../extra-package-licenses/js91-license.txt cd ../.. -rm -rf firefox-91.10.0 +rm -rf firefox-91.11.0 # Sudo. tar -xf sudo-1.9.11p3.tar.gz cd sudo-1.9.11p3 @@ -3163,15 +3169,15 @@ install -t /usr/share/licenses/graphite2 -Dm644 ../COPYING ../LICENSE cd ../.. rm -rf graphite2-1.3.14 # HarfBuzz. -tar -xf harfbuzz-4.3.0.tar.xz -cd harfbuzz-4.3.0 +tar -xf harfbuzz-4.4.1.tar.xz +cd harfbuzz-4.4.1 mkdir hb-build; cd hb-build meson --prefix=/usr --buildtype=minsize -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install install -t /usr/share/licenses/harfbuzz -Dm644 ../COPYING cd ../.. -rm -rf harfbuzz-4.3.0 +rm -rf harfbuzz-4.4.1 # FreeType (rebuild to support HarfBuzz). tar -xf freetype-2.12.1.tar.xz cd freetype-2.12.1 @@ -4597,14 +4603,14 @@ install -t /usr/share/licenses/cairomm -Dm644 ../COPYING cd ../.. rm -rf cairomm-1.14.0 # HarfBuzz (rebuild to support Cairo). -tar -xf harfbuzz-4.3.0.tar.xz -cd harfbuzz-4.3.0 +tar -xf harfbuzz-4.4.1.tar.xz +cd harfbuzz-4.4.1 mkdir hb-build; cd hb-build meson --prefix=/usr --buildtype=minsize -Dgraphite2=enabled -Dtests=disabled .. ninja ninja install cd ../.. -rm -rf harfbuzz-4.3.0 +rm -rf harfbuzz-4.4.1 # Pango. tar -xf pango-1.50.7.tar.xz cd pango-1.50.7 @@ -5237,8 +5243,8 @@ install -t /usr/share/licenses/ppp -Dm644 ../extra-package-licenses/ppp-license. cd .. rm -rf ppp-2.4.9 # Vim. -tar -xf vim-8.2.5046.tar.gz -cd vim-8.2.5046 +tar -xf vim-9.0.0000.tar.gz +cd vim-9.0.0000 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h ./configure --prefix=/usr --with-features=huge --enable-gpm --enable-gui=gtk3 --with-tlib=ncursesw --enable-luainterp --enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-tclinterp --with-tclsh=tclsh --with-compiledby="MassOS" @@ -5261,7 +5267,7 @@ rm -f /usr/share/applications/vim.desktop rm -f /usr/share/applications/gvim.desktop install -t /usr/share/licenses/vim -Dm644 LICENSE cd .. -rm -rf vim-8.2.5046 +rm -rf vim-9.0.0000 # libwpe. tar -xf libwpe-1.13.1.tar.xz cd libwpe-1.13.1 @@ -5448,26 +5454,21 @@ install -t /usr/share/licenses/sane -Dm644 ../COPYING ../LICENSE ../README.djpeg cd ../.. rm -rf backends-1.1.1 # HPLIP. -tar -xf hplip-3.22.2.tar.gz -cd hplip-3.22.2 -patch -Np1 -i ../patches/hplip-3.21.12-fix_too_many_bugs.patch +tar -xf hplip-3.22.6.tar.gz +cd hplip-3.22.6 +patch -Np1 -i ../patches/hplip-3.22.6-manyfixes.patch AUTOMAKE="automake --foreign" autoreconf -fi -./configure --prefix=/usr --disable-qt4 --disable-qt5 --enable-hpcups-install --enable-cups-drv-install --disable-imageProcessor-build --enable-pp-build -make -make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR=$PWD/destination-tmp install -rm -rf destination-tmp/etc/{sane.d,xdg} -rm -rf destination-tmp/usr/share/hal -rm -rf destination-tmp/etc/init.d -rm -f destination-tmp/usr/share/applications/hp-uiscan.desktop -rm -f destination-tmp/usr/share/applications/hplip.desktop -rm -f destination-tmp/usr/bin/hp-{uninstall,upgrade} -install -dm755 destination-tmp/etc/sane.d/dll.d -echo hpaio > destination-tmp/etc/sane.d/dll.d/hpaio -cp -a destination-tmp/* / -ldconfig +./configure --prefix=/usr --enable-cups-drv-install --enable-hpcups-install --disable-imageProcessor-build --enable-pp-build --disable-qt4 +make +make -j1 rulesdir=/usr/lib/udev/rules.d install +rm -rf /usr/share/hal +rm -f /etc/xdg/autostart/hplip-systray.desktop +rm -f /usr/share/applications/hp{lip,-uiscan}.desktop +rm -f /usr/bin/hp-{uninstall,upgrade} +rm -f /usr/share/hplip/{uninstall,upgrade}.py install -t /usr/share/licenses/hplip -Dm644 COPYING cd .. -rm -rf hplip-3.22.2 +rm -rf hplip-3.22.6 # Tk. tar -xf tk8.6.12-src.tar.gz cd tk8.6.12/unix @@ -5732,6 +5733,7 @@ meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/power-profiles-daemon -Dm644 ../COPYING +systemctl enable power-profiles-daemon cd ../.. rm -rf power-profiles-daemon-0.12 # NetworkManager. @@ -6052,14 +6054,14 @@ install -t /usr/share/licenses/cdparanoia -Dm644 COPYING-GPL COPYING-LGPL cd .. rm -rf cdparanoia-III-10.2 # mpg123. -tar -xf mpg123-1.29.3.tar.bz2 -cd mpg123-1.29.3 +tar -xf mpg123-1.30.0.tar.bz2 +cd mpg123-1.30.0 ./configure --prefix=/usr --enable-int-quality=yes --with-audio="alsa jack oss pulse sdl" make make install install -t /usr/share/licenses/mpg123 -Dm644 COPYING cd .. -rm -rf mpg123-1.29.3 +rm -rf mpg123-1.30.0 # libvpx. tar -xf libvpx_1.11.0.orig.tar.gz cd libvpx-1.11.0 @@ -6285,16 +6287,14 @@ install -t /usr/share/licenses/ffmpeg -Dm644 COPYING.GPLv2 COPYING.GPLv3 COPYING cd .. rm -rf ffmpeg-5.0.1 # OpenAL. -tar -xf openal-soft-1.21.1.tar.gz -cd openal-soft-1.21.1/build -sed -i "37i#include " ../utils/makemhr/loadsofa.cpp -sed -i "s/AVCodec \*codec/const AVCodec \*codec/" ../examples/alffplay.cpp -cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -Wno-dev -G Ninja .. +tar -xf openal-soft-1.22.2.tar.gz +cd openal-soft-1.22.2/build +cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev -G Ninja .. ninja ninja install install -t /usr/share/licenses/openal -Dm644 ../COPYING ../BSD-3Clause cd ../.. -rm -rf openal-soft-1.21.1 +rm -rf openal-soft-1.22.2 # GStreamer. tar -xf gstreamer-1.20.3.tar.xz cd gstreamer-1.20.3 @@ -7017,7 +7017,7 @@ plymouth-set-default-theme bgrt cd .. rm -rf plymouth-0.9.5 # Firefox. -tar --no-same-owner -xf firefox-101.0.1.tar.bz2 -C /usr/lib +tar --no-same-owner -xf firefox-102.0.tar.bz2 -C /usr/lib mkdir -p /usr/lib/firefox/distribution cat > /usr/lib/firefox/distribution/policies.json << END { @@ -7087,8 +7087,8 @@ install -t /usr/share/licenses/busybox -Dm644 LICENSE cd .. rm -rf busybox-1.35.0 # Linux Kernel. -tar -xf linux-5.18.7.tar.xz -cd linux-5.18.7 +tar -xf linux-5.18.8.tar.xz +cd linux-5.18.8 cp ../kernel-config .config make olddefconfig make @@ -7124,7 +7124,7 @@ find "$builddir" -type f -name '*.o' -delete ln -sr "$builddir" "/usr/src/linux" install -t /usr/share/licenses/linux -Dm644 COPYING LICENSES/exceptions/* LICENSES/preferred/* cd .. -rm -rf linux-5.18.7 +rm -rf linux-5.18.8 unset builddir # NVIDIA Open kernel modules. tar -xf open-gpu-kernel-modules-515.43.04.tar.gz diff --git a/changelog.md b/changelog.md index 6455daf..8ce9771 100644 --- a/changelog.md +++ b/changelog.md @@ -16,16 +16,21 @@ Upgraded software: - bc: `5.2.5 --> 5.3.3` - BIND Utils: `9.18.3 --> 9.18.4` - btrfs-progs: `5.18 --> 5.18.1` +- curl: `7.83.1 --> 7.84.0` - DirectX-Headers: `1.600.10 --> 1.602.0` - Exo: `4.17.1 --> 4.17.2` - File: `5.41 --> 5.42` -- Firefox: `101.0 --> 101.0.1` +- Firefox: `101.0 --> 102.0` +- Git: `2.36.1 --> 2.37.0` - glslang: `11.9.0 --> 11.10.0` - Graphviz: `3.0.0 --> 4.0.0` +- HarfBuzz: `4.3.0 --> 4.4.1` +- HPLIP: `3.22.2 --> 3.22.6` - htop: `3.1.2 --> 3.2.1` - hwdata: `0.359 --> 0.360` - ISO-Codes: `4.9.0 --> 4.10.0` - JasPer: `3.0.3 --> 3.0.5` +- JS91: `91.10.0 --> 91.11.0` - JSON: `4.06 --> 4.07` - kbd: `2.4.0 --> 2.5.1` - libdrm: `2.4.110 --> 2.4.111` @@ -36,11 +41,12 @@ Upgraded software: - libqmi: `1.30.6 --> 1.30.8` - librsvg: `2.54.3 --> 2.54.4` - libX11: `1.8 --> 1.8.1` -- Linux Kernel: `5.18.1 --> 5.18.7` +- Linux Kernel: `5.18.1 --> 5.18.8` - LLVM/Clang/LLD: `14.0.4 --> 14.0.6` - lxml: `4.8.0 --> 4.9.0` - Mesa: `22.1.0 --> 22.1.2` - Meson: `0.62.1 --> 0.62.2` +- mpg123: `1.29.3 --> 1.30.0` - mtools: `4.0.39 --> 4.0.40` - MuPDF: `1.19.1 --> 1.20.0` - Nettle: `3.7.3 --> 3.8` @@ -48,6 +54,7 @@ Upgraded software: - NetworkManager: `1.38.0 --> 1.38.2` - NSS: `3.79 --> 3.80` - ntfs-3g: `2021.8.22 --> 2022.5.17` +- OpenAL: `1.21.1 --> 1.22.2` - OpenSSL: `3.0.3 --> 3.0.4` - PipeWire: `0.3.51 --> 0.3.52` - Poppler: `22.05.0 --> 22.06.0` @@ -58,11 +65,14 @@ Upgraded software: - Speex: `1.2.0 --> 1.2.1` - SpeexDSP: `1.2.0 --> 1.2.1` - SPIRV-Headers: `1.3.204.1 --> 1.3.216.0` +- SQLite: `3.38.5 --> 3.39.0` - squashfs-tools: `4.5 --> 4.5.1` +- squashfuse: `0.1.104 --> 0.1.105` - Sudo: `1.9.10 --> 1.9.11p3` - systemd: `251.1 --> 251.2` - Thunderbird: `91.9.1 --> 91.10.0` - UPower: `0.99.18 --> 0.99.19` +- Vim: `8.2.5046 --> 9.0.0000` - Vulkan-Headers: `1.3.213 --> 1.3.217` - Vulkan-Loader: `1.3.213 --> 1.3.217` - x264: `0.164.3094 --> 0.164.3095` diff --git a/patches/hplip-3.21.12-fix_too_many_bugs.patch b/patches/hplip-3.21.12-fix_too_many_bugs.patch deleted file mode 100644 index 5bbff14..0000000 --- a/patches/hplip-3.21.12-fix_too_many_bugs.patch +++ /dev/null @@ -1,1903 +0,0 @@ -diff -aruN old/base/sixext.py new/base/sixext.py ---- old/base/sixext.py 2021-12-13 09:07:36.000000000 +0000 -+++ new/base/sixext.py 2021-12-20 19:53:08.151749424 +0000 -@@ -110,11 +110,11 @@ - - - def to_string_utf8(s): -- return s.decode("utf-8") -+ return s.decode("utf-8", 'ignore') - - - def to_string_latin(s): -- return s.decode("latin-1") -+ return s.decode("latin-1", 'ignore') - - - def to_unicode(s, enc=None): -diff -aruN old/configure.in new/configure.in ---- old/configure.in 2021-12-13 09:07:36.000000000 +0000 -+++ new/configure.in 2021-12-20 19:53:30.054614238 +0000 -@@ -618,7 +618,7 @@ - - if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then - AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) - if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -@@ -628,17 +628,29 @@ - fi - fi - --SAVE_CPPFLAGS="$CPPFLAGS" --CFLAGS=`python-config --includes` --if [ $? -eq 0 ] --then -- echo $FLAGS --else --CFLAGS=`python3-config --includes` -- if [ $? -eq 0 ] -- then -- echo $FLAGS -- fi -+AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)]) -+ -+PYTHON_INCLUDES=`$python3_config_path --includes` -+if test "X$PYTHON_INCLUDES" = "X" ; then -+ AC_MSG_ERROR([Cannot get Python includes via python3-config], 6) -+fi -+ -+PYTHON_LIBS=`$python3_config_path --libs` -+if test "X$PYTHON_LIBS" = "X" ; then -+ AC_MSG_ERROR([Cannot get Python libs via python3-config], 6) -+fi -+ -+SAVE_CFLAGS=$CFLAGS -+SAVE_LIBS=$LIBS -+ -+CFLAGS="$CFLAGS $PYTHON_INCLUDES" -+LIBS="$LIBS $PYTHON_LIBS" -+ -+AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6)) -+ -+if test "X$python_includes" != "Xok" ; then -+ CFLAGS="$SAVE_CFLAGS" -+ LIBS="$SAVE_LIBS" - fi - - #CFLAGS=`(python-config --includes)` -@@ -664,7 +676,6 @@ - AS_IF([test "x$FOUND_HEADER" != "xyes"], - [AC_MSG_ERROR([cannot find python-devel support], 6)]) - fi --CFLAGS="$save_CFLAGS" - - if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then - AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)]) -diff -aruN old/configure.in.orig new/configure.in.orig ---- old/configure.in.orig 1970-01-01 01:00:00.000000000 +0100 -+++ new/configure.in.orig 2021-12-20 19:52:57.311981206 +0000 -@@ -0,0 +1,792 @@ -+# -+# configure.in - hplip autoconf input file -+# -+# (c) 2004-2007 Copyright HP Development Company, LP -+# -+# exit status: -+# 0 = ok -+# 1 = error -+# 2 = no libusb -+# 3 = no cups-devel -+# 4 = no libnetsnmp -+# 5 = no netsnmp-devel -+# 6 = no python-devel -+# 7 = no pthread-devel -+# 8 = no ppdev-devel -+# 9 = no libcups -+# 10 = no libm -+# 11 = no libusb-devel -+# 12 = no sane-backends-devel -+# 13 = no libdbus-1 support -+# 14 = no dbus-devel support -+# 15 = fax requries dbus support -+# -+# 102 = no libjpeg -+# 103 = no jpeg-devel -+# 104 = no libdl -+ -+#AC_PREREQ(2.59) -+AC_INIT([HP Linux Imaging and Printing], [3.21.12], [3.21.12], [hplip]) -+#AM_INIT_AUTOMAKE([1.9 foreign]) -+AM_INIT_AUTOMAKE -+AC_DISABLE_STATIC -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LIBTOOL -+ -+# Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile. -+AC_CHECK_LIB([pthread], [pthread_create], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libpthread support], 7)]) -+AC_CHECK_LIB([m], [pow], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libm math support], 10)]) -+AC_CHECK_LIB([jpeg], [jpeg_set_defaults],[LIBS="$LIBS"], [AC_MSG_ERROR(["cannot find libjpeg support"], 102)]) -+AC_CHECK_LIB([dl], [dlopen], [LIBS="$LIBS" AC_DEFINE([HAVE_LIBDL])], [AC_MSG_ERROR(["cannot find libdl support"], 104)]) -+ -+# Checks for required header files. -+AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)]) -+AC_CHECK_HEADERS(jpeglib.h,, [AC_MSG_ERROR([cannot find libjpeg-devel support], 103)]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_C_BIGENDIAN(,[APDK_ENDIAN_FLAG="-DAPDK_LITTLE_ENDIAN"]) -+ -+# Autoconf-style header tests for APDK -+cat >prnt/hpijs/auto-include.h < -+#endif -+#ifdef HAVE_STDINT_H -+#include -+#endif -+#ifdef HAVE_MACHINE_TYPES_H -+#include -+#endif -+EOFH -+AC_CHECK_TYPES([uint32_t], [APDK_AUTO_INCLUDE_FLAG="-DAPDK_AUTO_INCLUDE"],, [#include "prnt/hpijs/auto-include.h"]) -+ -+AC_MSG_CHECKING("for platform-dependencies") -+darwin_build="no" -+case "$host" in -+ *-darwin*) -+ AC_MSG_RESULT("using Mac OS X platform.h") -+ cat >prnt/hpijs/platform.h < -+#include -+#include -+#include -+#include -+#include -+#include -+EOF -+ darwin_build="yes" -+ ;; -+ -+ *) -+ AC_MSG_RESULT("using Default platform.h") -+ cat >prnt/hpijs/platform.h < -+#include -+#include -+#include -+#include -+EOF -+ ;; -+esac -+AM_CONDITIONAL(DARWIN_BUILD, test x$darwin_build = xyes) -+AM_CONDITIONAL(GCC_GE_47, test `g++ -dumpversion | gawk '{print $1>=4.7?"1":"0"}'` = 1) -+ -+AC_MSG_CHECKING([for documentation build]) -+AC_ARG_ENABLE(doc_build, -+ [ --enable-doc-build enable documentation build (default=yes)], -+ doc_build=$enableval, doc_build=yes) -+if test "$doc_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(DOC_BUILD, test x$doc_build = xyes) -+ -+AC_MSG_CHECKING([for hpijs only build]) -+AC_ARG_ENABLE(hpijs_only_build, -+ [ --enable-hpijs-only-build enable hpijs only build (default=yes)(Deprecated)], -+ hpijs_only_build=$enableval, hpijs_only_build=no) -+if test "$hpijs_only_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_full=\# -+ epm_lite=\# -+ epm_hpcups_only=\# -+ epm_print_only_exclude=\# -+ epm_hpijs_only= -+ AC_MSG_WARN(HPIJS build is deprecated. Feature can be used as is. Fixes or updates will not be provided) -+else -+ AC_MSG_RESULT(no) -+ epm_hpijs_only=\# -+ AC_DEFINE(HAVE_LIBHPIP) -+fi -+AM_CONDITIONAL(HPIJS_ONLY_BUILD, test x$hpijs_only_build = xyes) -+ -+AC_MSG_CHECKING([for lite build]) -+AC_ARG_ENABLE(lite_build, -+ [ --enable-lite-build enable lite build, print & scan only (default=no)], -+ lite_build=$enableval, lite_build=no) -+if test "$lite_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_full=\# -+ epm_hpcups_only=\# -+ epm_print_only_exclude= -+ epm_lite= -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(LITE_BUILD, test x$lite_build = xyes) -+ -+AC_MSG_CHECKING([for hpcups only build]) -+AC_ARG_ENABLE(hpcups_only_build, -+ [ --enable-hpcups-only-build enable hpcups only build, print only (default=no)], -+ hpcups_only_build=$enableval, hpcups_only_build=no) -+if test "$hpcups_only_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_full=\# -+ epm_lite=\# -+ epm_hpcups_only= -+ epm_print_only_exclude=\# -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(HPCUPS_ONLY_BUILD, test x$hpcups_only_build = xyes) -+ -+AM_CONDITIONAL(HPLIP_BUILD, test x$hpcups_only_build = xno && test x$hpijs_only_build = xno) -+if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -+ AC_DEFINE(HAVE_LIBHPIP) -+fi -+ -+if test "$lite_build" = "no" && test "$hpcups_only_build" = "no" && test "$hpijs_only_build" = "no"; then -+ epm_full= -+ epm_lite=\# -+ epm_hpcups_only=\# -+ epm_print_only_exclude= -+fi -+AM_CONDITIONAL(FULL_BUILD, test x$hpcups_only_build = xno && test x$lite_build = xno && test x$hpijs_only_build = xno) -+ -+AC_MSG_CHECKING([for hpijs install]) -+AC_ARG_ENABLE(hpijs_install, -+ [ --enable-hpijs-install enable hpijs install (default=no)(Deprecated)], -+ hpijs_install=$enableval, hpijs_install=no) -+if test "$hpijs_install" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_hpijs_install=yes -+ AC_MSG_WARN(HPIJS is deprecated. Feature can be used as is. Fixes or updates will not be provided) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(HPIJS_INSTALL, test x$hpijs_install = xyes) -+ -+AC_MSG_CHECKING([for hpcups install]) -+AC_ARG_ENABLE(hpcups_install, -+ [ --enable-hpcups-install enable hpcups install (default=yes)], -+ hpcups_install=$enableval, hpcups_install=yes) -+if test "$hpcups_install" = "yes" && test "$hpijs_only_build" = "no"; then -+ AC_MSG_RESULT(yes) -+ epm_hpcups_install=yes -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(HPCUPS_INSTALL, test x$hpcups_install = xyes && test x$hpijs_only_build = xno) -+ -+AC_MSG_CHECKING([for new hpcups install]) -+AC_ARG_ENABLE(new_hpcups, -+ [ --enable-new-hpcups enable new hpcups install (default=no)], -+ new_hpcups=$enableval, new_hpcups=no) -+if test "$new_hpcups" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(NEW_HPCUPS, test x$new_hpcups = xyes) -+ -+AC_MSG_CHECKING([for hpps install]) -+AC_ARG_ENABLE(hpps_install, -+ [ --enable-hpps-install enable hpps install (default=yes)], -+ hpps_install=$enableval, hpps_install=yes) -+if test "$hpps_install" = "yes" && test "$hpijs_only_build" = "no"; then -+ AC_MSG_RESULT(yes) -+ epm_hpps_install=yes -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(HPPS_INSTALL, test x$hpps_install = xyes && test x$hpijs_only_build = xno) -+ -+AC_MSG_CHECKING([for network build]) -+AC_ARG_ENABLE(network_build, -+ [ --enable-network-build enable network build (default=yes)], -+ network_build=$enableval, network_build=yes) -+if test "$network_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(NETWORK_BUILD, test x$network_build = xyes) -+ -+AC_MSG_CHECKING([for parallel port build]) -+AC_ARG_ENABLE(pp_build, -+ [ --enable-pp-build enable parallel port build (default=no)(Deprecated) ], -+ pp_build=$enableval, pp_build=no) -+if test "$pp_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ AC_MSG_WARN(Parallel Port support deprecated. Feature can be used as is. Fixes or updates will not be provided) -+ AC_DEFINE(HAVE_PPORT) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_MSG_CHECKING([for class driver]) -+AC_ARG_ENABLE(class_driver, -+ [ --enable-class-driver enable class driver (default=no)], -+ class_driver=$enableval, class_driver=no) -+if test "$class_driver" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_full=\# -+ epm_lite=\# -+ epm_hpcups_only=\# -+ epm_print_only_exclude=\# -+ epm_scan=\# -+ epm_class_driver= -+ epm_class_install=yes -+ test `sh ./createPPD.sh -f` == 0 -+else -+ AC_MSG_RESULT(no) -+ test `sh ./createPPD.sh -q` == 0 -+fi -+AM_CONDITIONAL(HPLIP_CLASS_DRIVER, test x$class_driver = xyes) -+ -+ -+AC_MSG_CHECKING([for scanner build]) -+AC_ARG_ENABLE(scan_build, -+ [ --enable-scan-build enable scanner build (default=yes)], -+ scan_build=$enableval, scan_build=yes) -+if test "$scan_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ epm_scan= -+else -+ AC_MSG_RESULT(no) -+ epm_scan=\# -+fi -+AM_CONDITIONAL(SCAN_BUILD, test x$scan_build = xyes) -+ -+AC_MSG_CHECKING([for gui build]) -+AC_ARG_ENABLE(gui_build, -+ [ --enable-gui-build enable gui build (default=yes)], -+ gui_build=$enableval, gui_build=yes) -+if test "$gui_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(GUI_BUILD, test x$gui_build = xyes) -+ -+AC_MSG_CHECKING([for fax build]) -+AC_ARG_ENABLE(fax_build, -+ [ --enable-fax-build enable fax build (default=yes)], -+ fax_build=$enableval, fax_build=yes) -+if test "$fax_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(FAX_BUILD, test x$fax_build = xyes && test x$class_driver = xno) -+ -+#AppArmor Changes -+AC_MSG_CHECKING([for apparmor profile]) -+AC_ARG_ENABLE(apparmor_build, -+ [ --enable-apparmor_build enable apparmor build (default=no)], -+ apparmor_build=$enableval, apparmor_build=no) -+if test "$apparmor_build" = "yes"; then -+ if test -d /etc/apparmor.d/; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([cannot find apparmor support]) -+ fi -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(APPARMOR_BUILD, test x$apparmor_build = xyes) -+ -+ -+AC_MSG_CHECKING([for dbus build]) -+AC_ARG_ENABLE(dbus_build, -+ [ --enable-dbus-build enable dbus build (default=yes)], -+ dbus_build=$enableval, dbus_build=yes) -+if test "$dbus_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_MSG_CHECKING([for cups 1.1.x build]) -+AC_ARG_ENABLE(cups11_build, -+ [ --enable-cups11-build enable cups 1.1.x build (default=no)], -+ cups11_build=$enableval, cups11_build=no) -+if test "$cups11_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_CUPS11) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_MSG_CHECKING([for HPCUPS ImageProcessor build]) -+AC_ARG_ENABLE(imageProcessor_build, -+ [ --disable-imageProcessor-build disable HPCUPS ImageProcessor build (default=no)], -+ imageProcessor_build=$enableval, imageProcessor_build=yes) -+if test "$imageProcessor_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ AC_MSG_NOTICE([ImageProcessor build enabled]) -+else -+ AC_MSG_NOTICE([ImageProcessor build disabled]) -+ AC_DEFINE(DISABLE_IMAGEPROCESSOR) -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(DISBALE_IMAGEPROCESSOR_BUILD, test x$imageProcessor_build = xno) -+ -+AC_MSG_CHECKING([for udev sysfs enable rules]) -+AC_ARG_ENABLE(udev_sysfs_rules, -+ [ --enable-udev_sysfs_rules Use SYSFS attribute instead of ATTR/ATTRS attribute in udev rules(default=no)], -+ udev_sysfs_rules=$enableval, udev_sysfs_rules=no) -+if test "$udev_sysfs_rules" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(UDEV_SYSFS_RULES, test x$udev_sysfs_rules = xyes) -+ -+AC_MSG_CHECKING([for shadow build]) -+AC_ARG_ENABLE(shadow_build, -+ [ --enable-shadow-build enable shadow build (default=no)], -+ shadow_build=$enableval, shadow_build=no) -+if test "$shadow_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(SHADOW_BUILD, test x$shadow_build = xyes) -+ -+AC_MSG_CHECKING([for libusb-0.1 build]) -+AC_ARG_ENABLE(libusb01_build, -+ [ --enable-libusb01_build Use libusb-0.1 instead of libusb-1.0 (default=no. i.e. libusb-1.0)], -+ libusb01_build=$enableval, libusb01_build=no) -+if test "$libusb01_build" = "yes"; then -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_LIBUSB01) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes) -+ -+AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]), -+ cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend") -+ -+AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=/usr/lib/cups/filter]]), -+ cupsfilterdir=$withval, cupsfilterdir="/usr/lib/cups/filter") -+ -+AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=/usr/share/applications]]), -+ icondir=$withval, icondir="/usr/share/applications") -+ -+AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hp-uiscan.desktop install directory [default=/usr/share/applications]]), -+ icondir=$withval, icondir="/usr/share/applications") -+ -+AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=/etc/xdg/autostart]]), -+ systraydir=$withval, systraydir="/etc/xdg/autostart") -+ -+AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]), -+ hpppddir=$withval, hpppddir="$datadir/ppd/HP") -+ -+# AppArmor Changes -+AC_ARG_WITH(apparmordir, AC_HELP_STRING([--with-apparmordir=DIR], [set apparmor profile install directory [default=/etc/apparmor.d]]), -+ apparmordir=$withval, apparmordir="/etc/apparmor.d") -+ -+if test -f "/usr/share/cups/mime/mime.types"; then -+ abs_mimedir="/usr/share/cups/mime/" -+else -+ abs_mimedir="/etc/cups/" -+fi -+AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]), -+ mimedir=$withval, mimedir="$abs_mimedir") -+ -+AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]), -+ hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION") -+ -+AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]), -+ hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION") -+ -+AC_MSG_CHECKING([for foomatic ppd install]) -+AC_ARG_ENABLE(foomatic_ppd_install, -+ [ --enable-foomatic-ppd-install enable foomatic static ppd install (default=no)(Deprecated), uses hpppddir], -+ foomatic_ppd_install=$enableval, foomatic_ppd_install=no) -+if test $foomatic_ppd_install = yes; then -+ AC_MSG_RESULT(yes) -+ epm_foomatic_ppd_install=yes -+ AC_MSG_WARN(foomatic static ppd install is deprecated. Feature can be used as is. Fixes or updates will not be provided) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(FOOMATIC_PPD_INSTALL, test x$foomatic_ppd_install = xyes) -+ -+AC_ARG_WITH(drvdir, AC_HELP_STRING([--with-drvdir=DIR], [set cups drv install directory [default=datadir/cups/drv/hp]]), -+ drvdir=$withval, drvdir="$datadir/cups/drv/hp") -+ -+AC_MSG_CHECKING([for foomatic drv install]) -+AC_ARG_ENABLE(foomatic_drv_install, -+ [ --enable-foomatic-drv-install enable foomatic dynamic ppd install (default=no)(Deprecated), uses drvdir and hpppddir], -+ foomatic_drv_install=$enableval, foomatic_drv_install=no) -+if test $foomatic_drv_install = yes; then -+ AC_MSG_RESULT(yes) -+ epm_foomatic_drv_install=yes -+ AC_MSG_WARN(foomatic dynamic ppd install is deprecated. Feature can be used as is. Fixes or updates will not be provided) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(FOOMATIC_DRV_INSTALL, test x$foomatic_drv_install = xyes) -+ -+AC_MSG_CHECKING([for cups drv install]) -+AC_ARG_ENABLE(cups_drv_install, -+ [ --enable-cups-drv-install enable cups dynamic ppd install (default=yes), uses drvdir and hpppddir], -+ cups_drv_install=$enableval, cups_drv_install=yes) -+if test $cups_drv_install = yes && test $hpijs_only_build = no; then -+ AC_MSG_RESULT(yes) -+ epm_cups_drv_install=yes -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(CUPS_DRV_INSTALL, test x$cups_drv_install = xyes && test x$hpijs_only_build = xno) -+ -+AC_MSG_CHECKING([for cups ppd install]) -+AC_ARG_ENABLE(cups_ppd_install, -+ [ --enable-cups-ppd-install enable cups static ppd install (default=no), uses hpppddir], -+ cups_ppd_install=$enableval, cups_ppd_install=no) -+if test $cups_ppd_install = yes && test $hpijs_only_build = no; then -+ AC_MSG_RESULT(yes) -+ epm_cups_ppd_install=yes -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(CUPS_PPD_INSTALL, test x$cups_ppd_install = xyes && test x$hpijs_only_build = xno) -+ -+AC_MSG_CHECKING([for foomatic-rip-hplip install]) -+AC_ARG_ENABLE(foomatic_rip_hplip_install, -+ [ --enable-foomatic-rip-hplip-install enable foomatic-rip-hplip install (default=no)(Deprecated), uses cupsfilterdir], -+ foomatic_rip_hplip_install=$enableval, foomatic_rip_hplip_install=no) -+if test "$foomatic_rip_hplip_install" = "yes"; then -+ AC_MSG_RESULT(yes) -+ foomatic_filter="foomatic-rip-hplip" -+ epm_foomatic_rip_hplip_install=yes -+ AC_MSG_WARN(foomatic-rip-hplip install is deprecated. Feature can be used as is. Fixes or updates will not be provided) -+else -+ AC_MSG_RESULT(no) -+ foomatic_filter="foomatic-rip" -+fi -+AM_CONDITIONAL(RIP_INSTALL, test x$foomatic_rip_hplip_install = xyes) -+ -+AC_MSG_CHECKING([for qt5]) -+AC_ARG_ENABLE(qt5, -+ [ --enable-qt5 enable qt5 (default=no)], -+ qt5=$enableval, qt5=no) -+if test "$qt5" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(QT5_INSTALL, test x$qt5 = xyes) -+ -+ -+AC_MSG_CHECKING([for qt4]) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 enable qt4 (default=yes)], -+ qt4=$enableval, qt4=yes) -+if test "$qt4" = "yes" && test "$qt5" = "no"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+ qt4=no -+fi -+AM_CONDITIONAL(QT4_INSTALL, test x$qt4 = xyes) -+ -+AC_MSG_CHECKING([for qt3]) -+AC_ARG_ENABLE(qt3, -+ [ --enable-qt3 enable qt3 (default=no)], -+ qt3=$enableval, qt3=no) -+if test "$qt3" = "yes"; then -+ AC_MSG_RESULT(yes) -+ qt5=no -+ qt4=no -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(QT3_INSTALL, test x$qt3 = xyes) -+ -+if test "$gui_build" = "no"; then -+ qt3=no -+ qt4=no -+ qt5=no -+fi -+ -+epm_qt3=\# -+epm_qt4=\# -+epm_qt5=\# -+if test "$hpcups_only_build" = "no" && test "$hpijs_only_build" = "no"; then -+if test "$qt3" = "yes" && test "$qt4" = "no" && test "$qt5" = "no"; then -+ ui_toolkit=qt3 -+ epm_qt3= -+elif test "$qt4" = "yes" && test "$qt5" = "no"; then -+ ui_toolkit=qt4 -+ epm_qt4= -+elif test "$qt5" = "yes"; then -+ ui_toolkit=qt5 -+ epm_qt5= -+else -+ ui_toolkit=no -+fi -+fi -+ -+AC_MSG_CHECKING([for policykit]) -+AC_ARG_ENABLE(policykit, -+ [ --enable-policykit enable PolicyKit (default=no)], -+ policykit=$enableval, policykit=no) -+if test "$policykit" = "yes"; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL(POLICYKIT_INSTALL, test x$policykit = xyes) -+ -+# Determine where the PolicyKit policy file goes -+if test "$policykit" = "yes"; then -+ if test -d /usr/share/polkit-1; then -+ policykit_dir=/usr/share/polkit-1/actions -+ elif test -d /usr/share/PolicyKit; then -+ policykit_dir=/usr/share/PolicyKit/policy -+ else -+ policykit_dir=/usr/share/PolicyKit/policy -+ fi -+else -+ policykit_dir= -+fi -+ -+AC_MSG_CHECKING(for host machine platform) -+machine=`uname -m` -+if test "$machine" = "x86_32" || test "$machine" = "i686"; then -+ platform="x86_32" -+elif test "$machine" = "x86_64"; then -+ platform="x86_64" -+elif test "$machine" = "ppc"; then -+ platform="ppc" -+else -+ platform="unsupport" -+fi -+AC_MSG_RESULT($platform) -+ -+# Check conditional packages. -+ -+if test "$hpijs_only_build" = "no" && test "$network_build" = "yes" && test "$hpcups_only_build" = "no"; then -+# AC_CHECK_LIB([crypto], [CRYPTO_free], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find net-snmp support (or --disable-network-build)], 4)]) -+# AC_CHECK_LIB([netsnmp], [snmp_timeout], [LIBS="$LIBS" AC_DEFINE([HAVE_LIBNETSNMP])], [AC_MSG_ERROR([cannot find net-snmp support (or --disable-network-build)], 4)]) -+# AC_CHECK_HEADERS(net-snmp/net-snmp-config.h,, [AC_MSG_ERROR([cannot find net-snmp-devel support (or --disable-network-build)], 5)]) -+ -+ old_LIBS="$LIBS" -+ AC_CHECK_LIB([crypto], [CRYPTO_free],, [AC_MSG_ERROR([cannot find net-snmp support (or --disable-network-build)], 4)]) -+ AC_CHECK_LIB([netsnmp], [snmp_timeout], [LIBS="$old_LIBS" AC_DEFINE([HAVE_LIBNETSNMP]) SNMPLIB="netsnmp"], check_ucd=yes) -+if test "$check_ucd" = "yes"; then -+ AC_CHECK_LIB([snmp], [snmp_timeout], [LIBS="$old_LIBS" AC_DEFINE([HAVE_LIBNETSNMP]) AC_DEFINE([HAVE_UCDSNMP]) SNMPLIB="snmp"], -+ [AC_MSG_ERROR([cannot find net/ucd-snmp support (or --disable-network-build)], 4)]) -+ AC_CHECK_HEADERS(ucd-snmp/ucd-snmp-config.h,, [AC_MSG_ERROR([cannot find ucd-snmp-devel support (or --disable-network-build)], 5)]) -+else -+ AC_CHECK_HEADERS(net-snmp/net-snmp-config.h,, [AC_MSG_ERROR([cannot find net-snmp-devel support (or --disable-network-build)], 5)]) -+fi -+ -+fi -+ -+#checking for AVAHI LIBS -+if test "$hpijs_only_build" = "no" && test "$network_build" = "yes" && test "$hpcups_only_build" = "no"; then -+ AC_DEFINE([HAVE_LIBAVAHI], 1, [Needed by the compiler.]) -+ AC_CHECK_LIB([avahi-client], [avahi_client_new], , AC_MSG_ERROR(cannot find avahi_client support (or --disable-network-build))) -+ AC_CHECK_LIB([avahi-common], [avahi_strerror], , AC_MSG_ERROR(cannot find avahi_common support (or --disable-network-build))) -+ AC_CHECK_HEADERS(avahi-client/client.h,, [AC_MSG_ERROR([cannot find avahi_client support (or --disable-network-build)], 6)]) -+ AC_CHECK_HEADERS(avahi-common/malloc.h,, [AC_MSG_ERROR([cannot find avahi_common support (or --disable-network-build)], 6)]) -+fi -+ -+if test "$hpijs_only_build" = "no" && test "$pp_build" = "yes" && test "$hpcups_only_build" = "no"; then -+ AC_CHECK_HEADERS(linux/ppdev.h, ,[AC_MSG_ERROR([cannot find ppdev-devel support (or --disable-pp-build)], 8)]) -+fi -+ -+if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -+ AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ if test "$libusb01_build" = "yes"; then -+ AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) -+ AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -+ else -+ AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) -+ AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) -+ fi -+fi -+ -+SAVE_CPPFLAGS="$CPPFLAGS" -+CFLAGS=`python-config --includes` -+if [ $? -eq 0 ] -+then -+ echo $FLAGS -+else -+CFLAGS=`python3-config --includes` -+ if [ $? -eq 0 ] -+ then -+ echo $FLAGS -+ fi -+fi -+ -+#CFLAGS=`(python-config --includes)` -+if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then -+ AC_ARG_VAR([PYTHON], [Python interpreter/compiler command]) -+ AC_CHECK_PROGS(PYTHON,[python python3 python2]) -+ AM_PATH_PYTHON([2.2]) -+ AC_MSG_CHECKING([for path to Python.h]) -+ PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print (get_python_inc());"` -+ AC_MSG_RESULT("using $PYTHONINCLUDEDIR .... python${PYTHON_VERSION}/Python.h") -+ AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file]) -+ AC_CHECK_HEADERS([python${PYTHON_VERSION}/Python.h python${PYTHON_VERSION}mu/Python.h python${PYTHON_VERSION}m/Python.h ], -+ [FOUND_HEADER=yes; break;]) -+ -+ if test "x$FOUND_HEADER" != "xyes"; then -+ PYTHONVERSION=`$PYTHON -c "import sys; sys.stdout.write('{}.{}'.format(*sys.version_info[[:2]]));"` -+ AC_MSG_RESULT("using $PYTHONVERSION .... python${PYTHONVERSION}") -+ AC_ARG_VAR(PYTHONVERSION, [python version upto 2 decimals]) -+ AC_CHECK_HEADERS([python${PYTHONVERSION}/Python.h python${PYTHONVERSION}mu/Python.h python${PYTHONVERSION}m/Python.h ], -+ [FOUND_HEADER=yes; break;]) -+ fi -+ -+ AS_IF([test "x$FOUND_HEADER" != "xyes"], -+ [AC_MSG_ERROR([cannot find python-devel support], 6)]) -+fi -+CFLAGS="$save_CFLAGS" -+ -+if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then -+ AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)]) -+fi -+ -+# The PKG_CHECK_MODULES macro requires the pkgconfig package (pkg-config). Otherwise you get a strange shell script error -+# "syntax error near upexpected token: DBUS". -+if test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no" && test "$dbus_build" = "yes"; then -+# PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0, dbus-glib-1 >= 0.61],,[AC_MSG_ERROR([cannot find dbus-devel support: $DBUS_PKG_ERRORS], 14)]) -+ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0],,[AC_MSG_ERROR([cannot find dbus-devel support: $DBUS_PKG_ERRORS], 14)]) -+ AC_CHECK_LIB([dbus-1], [dbus_connection_open], [LIBS="$LIBS" AC_DEFINE([HAVE_DBUS])], [AC_MSG_ERROR([cannot find libdbus support], 13)]) -+fi -+ -+if test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no" && test "$fax_build" = "yes" && test "$dbus_build" = "no"; then -+ AC_MSG_ERROR([fax requires dbus support], 15) -+fi -+ -+# AC_DEFINE_DIR([DATADIR], [datadir]) -+# Copyright © 2006 Stepan Kasal -+# Copyright © 2006 Andreas Schwab -+# Copyright © 2006 Guido U. Draheim -+# Copyright © 2006 Alexandre Oliva -+# Copying and distribution of this file, with or without modification, are permitted in any medium without -+# royalty provided the copyright notice and this notice are preserved. -+AC_DEFUN([AC_DEFINE_DIR], [ -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn -+dnl refers to ${prefix}. Thus we have to use `eval' twice. -+ eval ac_define_dir="\"[$]$2\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ $1="$ac_define_dir" -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE -+]) -+ -+AC_DEFINE_DIR([abs_datadir], [datadir]) -+AC_DEFINE_DIR([abs_sbindir], [sbindir]) -+AC_DEFINE_DIR([abs_hpppddir], [hpppddir]) -+AC_DEFINE_DIR([abs_docdir], [hpdocdir]) -+AC_DEFINE_DIR([abs_htmldir], [hphtmldir]) -+abs_ppddir=${abs_hpppddir%/*} -+AC_DEFINE_DIR([abs_drvdir], [drvdir]) -+ -+AC_SUBST(abs_datadir) -+AC_SUBST(abs_sbindir) -+AC_SUBST(abs_hpppddir) -+AC_SUBST(abs_docdir) -+AC_SUBST(abs_htmldir) -+AC_SUBST(abs_ppddir) -+AC_SUBST(abs_drvdir) -+AC_SUBST(abs_mimedir) -+ -+# AppArmor Changes -+AC_SUBST(apparmordir) -+AC_SUBST(apparmor_build) -+AC_SUBST(mimedir) -+AC_SUBST(icondir) -+AC_SUBST(systraydir) -+AC_SUBST(cupsbackenddir) -+AC_SUBST(cupsfilterdir) -+AC_SUBST(hpppddir) -+AC_SUBST(hpdocdir) -+AC_SUBST(hphtmldir) -+AC_SUBST(drvdir) -+AC_SUBST(network_build) -+AC_SUBST(pp_build) -+AC_SUBST(gui_build) -+AC_SUBST(class_driver) -+AC_SUBST(scan_build) -+AC_SUBST(fax_build) -+AC_SUBST(dbus_build) -+AC_SUBST(cups11_build) -+AC_SUBST(imageProcessor_build) -+AC_SUBST(foomatic_drv_install) -+AC_SUBST(foomatic_ppd_install) -+AC_SUBST(foomatic_rip_hplip_install) -+AC_SUBST(foomatic_filter) -+AC_SUBST(cups_ppd_install) -+AC_SUBST(cups_drv_install) -+AC_SUBST(hpijs_install) -+AC_SUBST(hpcups_install) -+AC_SUBST(hpps_install) -+AC_SUBST(doc_build) -+AC_SUBST(shadow_build) -+AC_SUBST(libusb01_build) -+AC_SUBST(APDK_ENDIAN_FLAG) -+AC_SUBST(APDK_AUTO_INCLUDE_FLAG) -+AC_SUBST(ui_toolkit) -+AC_SUBST(platform) -+AC_SUBST(qt3) -+AC_SUBST(qt4) -+AC_SUBST(qt5) -+AC_SUBST(epm_foomatic_rip_hplip_install) -+AC_SUBST(epm_foomatic_ppd_install) -+AC_SUBST(epm_cups_ppd_install) -+AC_SUBST(epm_foomatic_drv_install) -+AC_SUBST(epm_cups_drv_install) -+AC_SUBST(epm_hpijs_install) -+AC_SUBST(epm_hpcups_install) -+AC_SUBST(epm_hpps_install) -+AC_SUBST(epm_qt5) -+AC_SUBST(epm_qt4) -+AC_SUBST(epm_qt3) -+AC_SUBST(epm_full) -+AC_SUBST(epm_lite) -+AC_SUBST(epm_hpcups_only) -+AC_SUBST(epm_hpijs_only) -+AC_SUBST(epm_print_only_exclude) -+AC_SUBST(epm_scan) -+AC_SUBST(policykit) -+AC_SUBST(policykit_dir) -+AC_SUBST(hpijs_only_build) -+AC_SUBST(lite_build) -+AC_SUBST(hpcups_only_build) -+AC_SUBST(SNMPLIB) -+AC_SUBST(prefix) -+AC_SUBST(udev_sysfs_rules) -+AC_SUBST(epm_class_driver) -+AC_SUBST(epm_class_install) -+ -+AC_CONFIG_FILES(Makefile hplip.conf hplip.desktop hp-uiscan.desktop hplip-systray.desktop prnt/drv/hpijs.drv prnt/drv/hpcups.drv hplip.list data/policykit/com.hp.hplip.service) -+AC_OUTPUT -diff -aruN old/createPPD.sh new/createPPD.sh ---- old/createPPD.sh 2021-12-13 09:07:36.000000000 +0000 -+++ new/createPPD.sh 2021-12-20 19:54:19.386891495 +0000 -@@ -54,15 +54,15 @@ - else - cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps - for i in ppd/classppd/ps/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - fi - #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps - for i in ppd/classppd/hpcups/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - #for i in ppd/classppd/ps/*.ppd; do -- # gzip -c "$i" > "$i.gz" -+ # gzip -nc "$i" > "$i.gz" - #done - - cat > class_cups_drv.inc < "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - - install -d ppd/hpijs - ppdc -d ppd/hpijs prnt/drv/hpijs.drv - echo "gzip ppd files..." - for i in ppd/hpijs/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - echo "building foomatic_drv.inc..." - ./hpijs-drv > foomatic_drv.inc $shadow -diff -aruN old/pcard/pcardext/pcardext.c new/pcard/pcardext/pcardext.c ---- old/pcard/pcardext/pcardext.c 2021-12-13 09:07:36.000000000 +0000 -+++ new/pcard/pcardext/pcardext.c 2021-12-20 19:53:18.688190737 +0000 -@@ -20,7 +20,7 @@ - Requires: - Python 2.2+ - --Author: Don Welch -+Author: Don Welch - - \*****************************************************************************/ - -@@ -41,9 +41,37 @@ - - int verbose=0; - -+#if PY_MAJOR_VERSION >= 3 -+ #define MOD_ERROR_VAL NULL -+ #define MOD_SUCCESS_VAL(val) val -+ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) -+ #define PyInt_AS_LONG PyLong_AS_LONG -+ #define MOD_DEF(ob, name, doc, methods) \ -+ static struct PyModuleDef moduledef = { \ -+ PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \ -+ ob = PyModule_Create(&moduledef); -+ -+ -+ #define PY_String_Bytes PyBytes_FromStringAndSize -+ #define PY_AsString_Bytes PyBytes_AsStringAndSize -+ -+#else -+ #define MOD_ERROR_VAL -+ #define MOD_SUCCESS_VAL(val) -+ #define MOD_INIT(name) void init##name(void) -+ #define MOD_DEF(ob, name, doc, methods) \ -+ ob = Py_InitModule3(name, methods, doc); -+ -+ #define PY_String_Bytes PyString_FromStringAndSize -+ #define PY_AsString_Bytes PyString_AsStringAndSize -+ -+#endif -+ - PyObject * readsectorFunc = NULL; - PyObject * writesectorFunc = NULL; - -+ -+ - int ReadSector(int sector, int nsector, void *buf, int size) - { - PyObject * result; -@@ -59,9 +87,13 @@ - if( result ) - { - Py_ssize_t len = 0; -- PyString_AsStringAndSize( result, &result_str, &len ); -+ -+ //PyString_AsStringAndSize( result, &result_str, &len ); -+ //PyBytes_AsStringAndSize( result, &result_str, &len ); -+ PY_AsString_Bytes( result, &result_str, &len ); - -- if( len < nsector*FAT_HARDSECT ) -+ -+ if( len < nsector*FAT_HARDSECT ) - { - goto abort; - } -@@ -208,7 +240,9 @@ - - if( FatReadFileExt( name, offset, len, buffer ) == len ) - { -- return PyString_FromStringAndSize( (char *)buffer, len ); -+ // return PyString_FromStringAndSize( (char *)buffer, len ); -+ return PY_String_Bytes( (char *)buffer, len ); -+ // return PyBytes_FromStringAndSize( (char *)buffer, len ); - } - else - { -@@ -236,14 +270,15 @@ - - static char pcardext_documentation[] = "Python extension for HP photocard services"; - --void initpcardext( void ) --{ -- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods, -- pcardext_documentation, (PyObject*)NULL, -- PYTHON_API_VERSION ); -- -- if (mod == NULL) -- return; -+MOD_INIT(pcardext) { -+ -+ PyObject* mod ; -+ MOD_DEF(mod, "pcardext", pcardext_documentation, pcardext_methods); -+ if (mod == NULL) -+ return MOD_ERROR_VAL; -+ -+ return MOD_SUCCESS_VAL(mod); -+ - } - - -diff -aruN old/pcard/pcardext/pcardext.c.orig new/pcard/pcardext/pcardext.c.orig ---- old/pcard/pcardext/pcardext.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ new/pcard/pcardext/pcardext.c.orig 2021-12-13 09:07:36.000000000 +0000 -@@ -0,0 +1,249 @@ -+/*****************************************************************************\ -+pcardext - Python extension for HP photocard services -+ -+ (c) Copyright 2003-2015 HP Development Company, L.P. -+ -+ 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 2 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, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+Requires: -+Python 2.2+ -+ -+Author: Don Welch -+ -+\*****************************************************************************/ -+ -+#define PY_SSIZE_T_CLEAN -+ -+ -+#include -+#include -+#include "../fat.h" -+ -+ -+/* Ref: PEP 353 (Python 2.5) */ -+#if PY_VERSION_HEX < 0x02050000 -+typedef int Py_ssize_t; -+#define PY_SSIZE_T_MAX INT_MAX -+#define PY_SSIZE_T_MIN INT_MIN -+#endif -+ -+int verbose=0; -+ -+PyObject * readsectorFunc = NULL; -+PyObject * writesectorFunc = NULL; -+ -+int ReadSector(int sector, int nsector, void *buf, int size) -+{ -+ PyObject * result; -+ char * result_str; -+ -+ if( readsectorFunc ) -+ { -+ if( nsector <= 0 || (nsector*FAT_HARDSECT) > size || nsector > FAT_BLKSIZE ) -+ goto abort; -+ -+ result = PyObject_CallFunction( readsectorFunc, "ii", sector, nsector ); -+ -+ if( result ) -+ { -+ Py_ssize_t len = 0; -+ PyString_AsStringAndSize( result, &result_str, &len ); -+ -+ if( len < nsector*FAT_HARDSECT ) -+ { -+ goto abort; -+ } -+ -+ memcpy( buf, result_str, nsector*FAT_HARDSECT ); -+ return 0; -+ } -+ } -+ -+abort: -+ return 1; -+} -+ -+int WriteSector(int sector, int nsector, void *buf, int size ) -+{ -+ PyObject * result; -+ -+ if( writesectorFunc ) -+ { -+ result = PyObject_CallFunction( writesectorFunc, "iis#", sector, nsector, buf, size ); -+ -+ return PyInt_AS_LONG( result ); -+ } -+ -+ return 1; -+} -+ -+ -+PyObject * pcardext_mount( PyObject * self, PyObject * args ) -+{ -+ if( !PyArg_ParseTuple( args, "OO", &readsectorFunc, &writesectorFunc ) ) -+ { -+ return Py_BuildValue( "i", 1 ); -+ } -+ -+ if( !PyCallable_Check( readsectorFunc ) || !PyCallable_Check( writesectorFunc ) ) -+ { -+ return Py_BuildValue( "i", 2 ); -+ } -+ -+ Py_INCREF( readsectorFunc ); -+ Py_INCREF( writesectorFunc ); -+ -+ int i = FatInit(); -+ /*char buf[1024]; -+ sprintf( buf, "print 'FatInit()=%d\n'", i ); -+ PyRun_SimpleString( buf );*/ -+ -+ return Py_BuildValue( "i", i ); // ==0 ->OK, !=0 --> NG -+} -+ -+ -+PyObject * pcardext_df( PyObject * self, PyObject * args ) -+{ -+ return Py_BuildValue( "i", FatFreeSpace() ); -+} -+ -+ -+PyObject * pcardext_ls( PyObject * self, PyObject * args ) -+{ -+ PyObject * file_list; -+ file_list = PyList_New((Py_ssize_t)0); -+ FILE_ATTRIBUTES fa; -+ -+ FatDirBegin( &fa ); -+ -+ do -+ { -+ if( fa.Attr != 'x' ) -+ PyList_Append( file_list, Py_BuildValue( "(sci)", fa.Name, fa.Attr, fa.Size ) ); -+ -+ } while( FatDirNext( &fa ) ); -+ -+ return file_list; -+} -+ -+ -+PyObject * pcardext_cp( PyObject * self, PyObject * args ) -+{ -+ char * name; -+ int fileno = 0; -+ -+ if( !PyArg_ParseTuple( args, "si", &name, &fileno ) ) -+ { -+ return Py_BuildValue( "i", 0 ); -+ } -+ -+ return Py_BuildValue( "i", FatReadFile( name, fileno ) ); -+} -+ -+PyObject * pcardext_cd( PyObject * self, PyObject * args ) -+{ -+ char * dir; -+ -+ if( !PyArg_ParseTuple( args, "s", &dir ) ) -+ { -+ return Py_BuildValue( "i", 0 ); -+ } -+ -+ FatSetCWD( dir ); -+ -+ return Py_BuildValue( "i", 1 ); -+} -+ -+PyObject * pcardext_rm( PyObject * self, PyObject * args ) -+{ -+ char * name; -+ if( !PyArg_ParseTuple( args, "s", &name ) ) -+ { -+ return Py_BuildValue( "i", 0 ); -+ } -+ -+ return Py_BuildValue( "i", FatDeleteFile( name ) ); -+} -+ -+PyObject * pcardext_umount( PyObject * self, PyObject * args ) -+{ -+ return Py_BuildValue( "" ); -+} -+ -+PyObject * pcardext_info( PyObject * self, PyObject * args ) -+{ -+ PHOTO_CARD_ATTRIBUTES pa; -+ FatDiskAttributes( &pa ); -+ -+ return Py_BuildValue( "(siiiiissi)", pa.OEMID, pa.BytesPerSector, pa.SectorsPerCluster, pa.ReservedSectors, -+ pa.RootEntries, pa.SectorsPerFat, pa.VolumeLabel, pa.SystemID, -+ pa.WriteProtect ); -+} -+ -+PyObject * pcardext_read( PyObject * self, PyObject * args ) -+{ -+ char * name; -+ int offset = 0; -+ Py_ssize_t len = 0; -+ void * buffer; -+ -+ if( !PyArg_ParseTuple( args, "sii", &name, &offset, &len ) ) -+ { -+ return Py_BuildValue( "s", "" ); -+ } -+ -+ buffer = alloca( len ); -+ -+ if( FatReadFileExt( name, offset, len, buffer ) == len ) -+ { -+ return PyString_FromStringAndSize( (char *)buffer, len ); -+ } -+ else -+ { -+ return Py_BuildValue( "s", "" ); -+ } -+ -+ -+} -+ -+ -+static PyMethodDef pcardext_methods[] = -+{ -+ { "mount", (PyCFunction)pcardext_mount, METH_VARARGS }, -+ { "ls", (PyCFunction)pcardext_ls, METH_VARARGS }, -+ { "cp", (PyCFunction)pcardext_cp, METH_VARARGS }, -+ { "cd", (PyCFunction)pcardext_cd, METH_VARARGS }, -+ { "rm", (PyCFunction)pcardext_rm, METH_VARARGS }, -+ { "umount", (PyCFunction)pcardext_umount, METH_VARARGS }, -+ { "df", (PyCFunction)pcardext_df, METH_VARARGS }, -+ { "info", (PyCFunction)pcardext_info, METH_VARARGS }, -+ { "read", (PyCFunction)pcardext_read, METH_VARARGS }, -+ { NULL, NULL } -+}; -+ -+ -+static char pcardext_documentation[] = "Python extension for HP photocard services"; -+ -+void initpcardext( void ) -+{ -+ PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods, -+ pcardext_documentation, (PyObject*)NULL, -+ PYTHON_API_VERSION ); -+ -+ if (mod == NULL) -+ return; -+} -+ -+ -diff -aruN old/prnt/hpcups/HPCupsFilter.h new/prnt/hpcups/HPCupsFilter.h ---- old/prnt/hpcups/HPCupsFilter.h 2021-12-13 09:07:36.000000000 +0000 -+++ new/prnt/hpcups/HPCupsFilter.h 2021-12-20 19:52:57.311981206 +0000 -@@ -38,6 +38,8 @@ - #include - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff -aruN old/prnt/hpcups/HPCupsFilter.h.orig new/prnt/hpcups/HPCupsFilter.h.orig ---- old/prnt/hpcups/HPCupsFilter.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ new/prnt/hpcups/HPCupsFilter.h.orig 2021-12-13 09:07:36.000000000 +0000 -@@ -0,0 +1,129 @@ -+/*****************************************************************************\ -+ HPCupsFilter.h : Interface for HPCupsFilter class -+ -+ Copyright (c) 1996 - 2015, HP Co. -+ All rights reserved. -+ -+ Redistribution and use in source and binary forms, with or without -+ modification, are permitted provided that the following conditions -+ are met: -+ 1. Redistributions of source code must retain the above copyright -+ notice, this list of conditions and the following disclaimer. -+ 2. Redistributions in binary form must reproduce the above copyright -+ notice, this list of conditions and the following disclaimer in the -+ documentation and/or other materials provided with the distribution. -+ 3. Neither the name of HP nor the names of its -+ contributors may be used to endorse or promote products derived -+ from this software without specific prior written permission. -+ -+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -+ NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -+ TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+\*****************************************************************************/ -+ -+#ifndef HP_CUPSFILTER_H -+#define HP_CUPSFILTER_H -+ -+#include "CommonDefinitions.h" -+#include "SystemServices.h" -+#include "Compressor.h" -+#include "Job.h" -+#include -+#include "dbuscomm.h" -+ -+#define DBITMAPFILEHEADER 14 -+#define DBITMAPINFOHEADER 40 -+ -+enum eRasterType -+{ -+ BLACK_RASTER, -+ COLOR_RASTER -+}; -+ -+typedef struct -+{ -+ short bfType; -+ int bfSize; -+ short bfReserved1; -+ short bfReserved2; -+ int bfOffBits; -+} BITMAPFILEHEADER; -+ -+typedef struct -+{ -+ int biSize; -+ int biWidth; -+ int biHeight; -+ short biPlanes; -+ short biBitCount; -+ int biCompression; -+ int biSizeImage; -+ int biXPelsPerMeter; -+ int biYPelsPerMeter; -+ int biClrUsed; -+ int biClrImportant; -+} BITMAPINFOHEADER; -+ -+class HPCupsFilter -+{ -+public: -+ -+ HPCupsFilter(); -+ ~HPCupsFilter(); -+ int StartPrintJob(int argc, char *argv[]); -+ void CancelJob(); -+ void RemoveStatus(); -+ -+ void WriteBMPHeader (FILE *fp, int width, int height, eRasterType raster_type); -+ void WriteBMPRaster (FILE *fp, BYTE *raster, int width, eRasterType raster_type); -+ -+private: -+ -+ BYTE *m_pPrinterBuffer; -+ Job m_Job; -+ SystemServices *m_pSys; -+ int child_pid; -+ char **m_argv; -+ JobAttributes m_JA; -+ ppd_file_t *m_ppd; -+ DBusCommunicator m_DBusComm; -+ -+private: -+ void closeFilter(); -+ void cleanup(); -+ //void getLogLevel(); -+ DRIVER_ERROR startPage (cups_page_header2_t *header); -+ int processRasterData(cups_raster_t *cups_raster); -+ void extractBlackPixels(cups_page_header2_t *cups_header, -+ BYTE *kRaster, BYTE *rgbRaster); -+ void printCupsHeaderInfo(cups_page_header2_t *header); -+ bool isBlankRaster(BYTE *input_raster, cups_page_header2_t *header); -+ int m_iLogLevel; -+ -+ void CreateBMPHeader(int width, int height, int planes, int bpp); -+ void WriteCBMPHeader (FILE *fp, int width, int height); -+ void WriteKBMPHeader (FILE *fp, int width, int height); -+ void WriteCBMPRaster (FILE *fp, BYTE *rgb_raster, int width); -+ void WriteKBMPRaster (FILE *fp, BYTE *k_raster, int width); -+ int adj_c_width; -+ int adj_k_width; -+ BYTE *black_raster; -+ BYTE *color_raster; -+ BITMAPFILEHEADER bmfh; -+ BITMAPINFOHEADER bmih; -+ -+#ifdef UNITTESTING -+ friend class TestHPCupsFilter; -+#endif -+ -+}; -+ -+#endif // HP_CUPSFILTER_H -+ -diff -aruN old/prnt/hpijs/hpcupsfax.cpp new/prnt/hpijs/hpcupsfax.cpp ---- old/prnt/hpijs/hpcupsfax.cpp 2021-12-13 09:07:36.000000000 +0000 -+++ new/prnt/hpijs/hpcupsfax.cpp 2021-12-20 19:52:57.311981206 +0000 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE -diff -aruN old/unload.py new/unload.py ---- old/unload.py 2021-12-13 09:07:37.000000000 +0000 -+++ new/unload.py 2021-12-20 19:53:18.688190737 +0000 -@@ -44,6 +44,11 @@ - - # Local - from base.g import * -+from base.sixext import PY3 -+if PY3: -+ log.error("This functionality is not spported in python3 environment.") -+ sys.exit(1) -+ - from base import device, utils, tui, module - from prnt import cups - -diff -aruN old/upgrade.py new/upgrade.py ---- old/upgrade.py 2021-12-13 09:07:37.000000000 +0000 -+++ new/upgrade.py 2021-12-20 19:52:40.912331759 +0000 -@@ -207,6 +207,11 @@ - if os.getenv("HPLIP_DEBUG"): - log.set_level('debug') - -+ -+log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Archlinux software package manager pacman.") -+clean_exit(1) -+ -+ - for o, a in opts: - if o in ('-h', '--help'): - usage() -diff -aruN old/upgrade.py.orig new/upgrade.py.orig ---- old/upgrade.py.orig 1970-01-01 01:00:00.000000000 +0100 -+++ new/upgrade.py.orig 2021-12-13 09:07:37.000000000 +0000 -@@ -0,0 +1,446 @@ -+#!/usr/bin/python -+# -*- coding: utf-8 -*- -+# -+# (c) Copyright 2011-2015 HP Development Company, L.P. -+# -+# 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 2 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, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+# -+# Author: Amarnath Chitumalla -+# -+from __future__ import print_function -+__version__ = '1.0' -+__title__ = 'HPLIP upgrade latest version' -+__mod__ = 'hp-upgrade' -+__doc__ = "HPLIP installer to upgrade to latest version." -+ -+# Std Lib -+import getopt, os, sys, re, time, datetime -+ -+# Local -+from base.g import * -+from base.strings import * -+from base import utils, tui, module, os_utils, services, validation -+from installer.core_install import * -+from base.sixext.moves import input -+ -+ -+USAGE = [(__doc__, "", "name", True), -+ ("Usage: %s [OPTIONS]" % __mod__, "", "summary", True), -+ utils.USAGE_SPACE, -+ utils.USAGE_MODE, -+ ("Run in interactive mode:", "-i or --interactive (Default)", "option", False), -+# ("Run in graphical UI mode:", "-u or --gui (future use)", "option", False), -+ utils.USAGE_SPACE, -+ utils.USAGE_OPTIONS, -+ utils.USAGE_HELP, -+ utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, -+ ("Check for update and notify:","--notify","option",False), -+ ("Check only available version:","--check","option",False), -+# ("Non-interactive mode:","-n(Without asking permissions)(future use)","option",False), -+ ("Specify the path to the .run file on local system:","-p","option", False), -+ ("Download HPLIP package location:","-d (default location ~/Downloads)","option", False), -+ ("Override existing HPLIP installation even if latest vesrion is installed:","-o","option",False), -+# ("Take options from the file instead of command line:","-f (future use)","option",False) -+ ] -+ -+mode = INTERACTIVE_MODE -+EXISTING_PACKAGE_PATH=None -+PATH_TO_DOWNLOAD_INSTALLER=os.path.expanduser('~/Downloads') -+FORCE_INSTALL=False -+CHECKING_ONLY=False -+NOTIFY=False -+HPLIP_VERSION_INFO_SOURCEFORGE_SITE ="http://hplip.sourceforge.net/hplip_web.conf" -+HPLIP_WEB_SITE ="http://hplipopensource.com/hplip-web/index.html" -+HPLIP_PACKAGE_SITE = "http://sourceforge.net/projects/hplip/files/hplip" -+IS_QUIET_MODE = False -+DONOT_CLOSE_TERMINAL = False -+CURRENT_WORKING_DIR = '' -+ -+def hold_terminal(): -+ if DONOT_CLOSE_TERMINAL: -+ log.info("\n\nPlease close this terminal manually. ") -+ try: -+ while 1: -+ pass -+ except KeyboardInterrupt: -+ pass -+ -+ -+def usage(typ='text'): -+ if typ == 'text': -+ utils.log_title(__title__, __version__) -+ -+ utils.format_text(USAGE, typ, __title__, __mod__, __version__) -+ hold_terminal() -+ sys.exit(0) -+ -+def clean_exit(code=0, waitTerminal=True): -+ if not NOTIFY and not CHECKING_ONLY and not IS_QUIET_MODE: -+ log.info("") -+ log.info("Done.") -+ change_spinner_state(True) -+ mod.unlockInstance() -+ hold_terminal() -+ sys.exit(code) -+ -+ -+def parse_HPLIP_version(hplip_version_file, pat): -+ ver = "0.0.0" -+ if not os.path.exists(hplip_version_file): -+ return ver -+ -+ try: -+ fp= open(hplip_version_file, 'r') -+ except IOError: -+ log.error("Failed to get hplip version since %s file is not found."%hplip_version_file) -+ return ver -+ data = fp.read() -+ for line in data.splitlines(): -+ if pat.search(line): -+ ver = pat.search(line).group(1) -+ break -+ -+ log.debug("Latest HPLIP version = %s." % ver) -+ return ver -+ -+ -+def get_hplip_version_from_sourceforge(): -+ HPLIP_latest_ver="0.0.0" -+ -+ # get HPLIP version info from hplip_web.conf file -+ sts, HPLIP_Ver_file = utils.download_from_network(HPLIP_VERSION_INFO_SOURCEFORGE_SITE) -+ if sts == 0: -+ hplip_version_conf = ConfigBase(HPLIP_Ver_file) -+ HPLIP_latest_ver = hplip_version_conf.get("HPLIP","Latest_version","0.0.0") -+ os.unlink(HPLIP_Ver_file) -+ -+ return HPLIP_latest_ver -+ -+ -+def get_hplip_version_from_hplipopensource(): -+ HPLIP_latest_ver="0.0.0" -+ pat = re.compile(r"""The current version of the HPLIP solution is version (\d{1,}\.\d{1,}\.\d{1,}[a-z]{0,})\. \(.*""") -+ sts, HPLIP_Ver_file = utils.download_from_network(HPLIP_WEB_SITE) -+ if sts == 0: -+ HPLIP_latest_ver = parse_HPLIP_version(HPLIP_Ver_file, pat) -+ os.unlink(HPLIP_Ver_file) -+ -+ return HPLIP_latest_ver -+ -+ -+def get_latest_hplip_version(): -+ HPLIP_latest_ver = get_hplip_version_from_sourceforge() -+ -+ if HPLIP_latest_ver == "0.0.0": ## if failed to connect the sourceforge site, then check HPLIP site. -+ HPLIP_latest_ver = get_hplip_version_from_hplipopensource() -+ -+ return HPLIP_latest_ver -+ -+ -+def digital_signature_fail_confirmation(msg): -+ log.error(log.bold(msg)) -+ ok,choice = tui.enter_choice("Do you want continue without Digital Signature verification (y=yes, n=no*):", ['y','n'],'n') -+ if not ok or choice == 'n': -+ return False -+ else: -+ return True -+ -+ -+def download_hplip_installer(path_to_download, hplip_version): -+ url="%s/%s/hplip-%s.run" %(HPLIP_PACKAGE_SITE, hplip_version, hplip_version) -+ hplip_package = "%s/hplip-%s.run" %(path_to_download, hplip_version) -+ -+ log.info("Downloading hplip-%s.run file..... Please wait. "%hplip_version ) -+ sts,download_file = utils.download_from_network(url, hplip_package, True) -+ log.info("") -+ -+ if not os.path.exists(hplip_package): -+ log.error("Failed to download %s file."%hplip_package) -+ return '','' -+ -+ log.info("Downloading hplip-%s.run.asc file..... Please wait. "%hplip_version ) -+ hplip_digsig = hplip_package+".asc" -+ url = url +".asc" -+ sts,download_file = utils.download_from_network(url, hplip_digsig) -+ log.info("") -+ -+ if not os.path.exists(hplip_digsig): -+ log.error("Failed to download %s file."%hplip_package) -+ return hplip_package, '' -+ -+ return hplip_package, hplip_digsig -+ -+ -+###################### Main ############### -+log.set_module(__mod__) -+try: -+ mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE, -+ (INTERACTIVE_MODE, GUI_MODE), -+ (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), True) -+ -+ opts, device_uri, printer_name, mode, ui_toolkit, loc = \ -+ mod.parseStdOpts('hl:gniup:d:of:sw', ['notify','check','help', 'help-rest', 'help-man', 'help-desc', 'interactive', 'gui', 'lang=','logging=', 'debug'], -+ handle_device_printer=False) -+ -+ -+ -+except getopt.GetoptError as e: -+ log.error(e.msg) -+ usage() -+ -+if os.geteuid() == 0: -+ log.error("%s %s" %(__mod__, queryString(ERROR_RUNNING_AS_ROOT))) -+ clean_exit(1) -+ -+if os.getenv("HPLIP_DEBUG"): -+ log.set_level('debug') -+ -+for o, a in opts: -+ if o in ('-h', '--help'): -+ usage() -+ -+ elif o == '--help-rest': -+ usage('rest') -+ -+ elif o == '--help-man': -+ usage('man') -+ -+ elif o in ('-q', '--lang'): -+ language = a.lower() -+ -+ elif o == '--help-desc': -+ print(__doc__, end=' ') -+ clean_exit(0,False) -+ -+ elif o in ('-l', '--logging'): -+ log_level = a.lower().strip() -+ if not log.set_level(log_level): -+ usage() -+ -+ elif o in ('-g', '--debug'): -+ log.set_level('debug') -+ -+ elif o == '-n': -+ mode = NON_INTERACTIVE_MODE -+ log.info("NON_INTERACTIVE mode is not yet supported.") -+ usage() -+ clean_exit(0,False) -+ -+ elif o == '-p': -+ EXISTING_PACKAGE_PATH=a -+ -+ elif o == '-d': -+ PATH_TO_DOWNLOAD_INSTALLER=a -+ -+ elif o == '-o': -+ FORCE_INSTALL = True -+ -+ elif o in ('-u', '--gui'): -+ log.info("GUI is not yet supported.") -+ usage() -+ clean_exit(0, False) -+ elif o == '--check': -+ CHECKING_ONLY = True -+ elif o == '--notify': -+ NOTIFY = True -+ elif o == '-s': -+ IS_QUIET_MODE = True -+ elif o == '-f': -+ log.info("Option from file is not yet supported") -+ usage() -+ clean_exit(0, False) -+ elif o == '-w': -+ DONOT_CLOSE_TERMINAL = True -+ -+if not NOTIFY and not CHECKING_ONLY and not IS_QUIET_MODE: -+ mod.quiet= False -+ mod.showTitle() -+ -+if NOTIFY or CHECKING_ONLY: -+ mod.lockInstance('check',True) -+else: -+ mod.lockInstance('upgrade',True) -+ -+log_file = os.path.normpath('%s/hp-upgrade.log'%prop.user_dir) -+ -+if os.path.exists(log_file): -+ try: -+ os.remove(log_file) -+ except OSError: -+ pass -+ -+log.set_logfile(log_file) -+log.set_where(log.LOG_TO_CONSOLE_AND_FILE) -+ -+ -+log.debug("Upgrade log saved in: %s" % log.bold(log_file)) -+log.debug("") -+try: -+ change_spinner_state(False) -+ core = CoreInstall(MODE_CHECK) -+ if not utils.check_network_connection(): -+ log.error("Either Internet is not working or Wget is not installed.") -+ clean_exit(1) -+ -+ installed_version=sys_conf.get("hplip","version","0.0.0") -+ log.debug("HPLIP previous installed version =%s." %installed_version) -+ -+ HPLIP_latest_ver = get_latest_hplip_version() -+ -+ if HPLIP_latest_ver == "0.0.0": -+ log.error("Failed to get latest version of HPLIP.") -+ clean_exit(1) -+ -+ user_conf.set('upgrade','latest_available_version',HPLIP_latest_ver) -+ if CHECKING_ONLY is True: -+ log.debug("Available HPLIP version =%s."%HPLIP_latest_ver) -+ -+ elif NOTIFY is True: -+ if not utils.Is_HPLIP_older_version(installed_version, HPLIP_latest_ver): -+ log.debug("Latest version of HPLIP is already installed.") -+ -+ else: -+ msg = "Latest version of HPLIP-%s is available."%HPLIP_latest_ver -+ if core.is_auto_installer_support(): -+ distro_type= 1 -+ else: -+ distro_type= 2 -+ -+ if ui_toolkit == 'qt3': -+ if not utils.canEnterGUIMode(): -+ log.error("%s requires GUI support. Is Qt3 Installed?.. Exiting." % __mod__) -+ clean_exit(1) -+ -+ try: -+ from qt import * -+ from ui.upgradeform import UpgradeForm -+ except ImportError: -+ log.error("Unable to load Qt3 support. Is it installed? ") -+ clean_exit(1) -+ -+ # create the main application object -+ app = QApplication(sys.argv) -+ QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) -+ dialog = UpgradeForm(None, "",0,0,distro_type, msg) -+ dialog.show() -+ -+ log.debug("Starting GUI loop...") -+ app.exec_loop() -+ -+ else: #qt4 -+ if not utils.canEnterGUIMode4(): -+ log.error("%s requires GUI support . Is Qt4 installed?.. Exiting." % __mod__) -+ clean_exit(1) -+ -+ try: -+ from PyQt4.QtGui import QApplication, QMessageBox -+ from ui4.upgradedialog import UpgradeDialog -+ except ImportError: -+ log.error("Unable to load Qt4 support. Is it installed?") -+ clean_exit(1) -+ -+ app = QApplication(sys.argv) -+ dialog = UpgradeDialog(None, distro_type, msg) -+ -+ dialog.show() -+ log.debug("Starting GUI loop...") -+ app.exec_() -+ -+ else: -+ if FORCE_INSTALL is False: -+ if utils.Is_HPLIP_older_version(installed_version, HPLIP_latest_ver): -+ if IS_QUIET_MODE: -+ log.info("Newer version of HPLIP-%s is available."%HPLIP_latest_ver) -+ ok,choice = tui.enter_choice("Press 'y' to continue to upgrade HPLIP-%s (y=yes*, n=no):"%HPLIP_latest_ver, ['y','n'],'y') -+ if not ok or choice == 'n': -+ log.info("Recommended to install latest version of HPLIP-%s"%HPLIP_latest_ver) -+ clean_exit(0, False) -+ else: -+ log.info("Latest version of HPLIP is already installed.") -+ clean_exit(0,False) -+ -+ # check distro information. -+ if not core.is_auto_installer_support(): -+ log.info("Please install HPLIP manually as mentioned in 'http://hplipopensource.com/hplip-web/install/manual/index.html' site") -+ clean_exit(0) -+ -+ if not services.close_running_hp_processes(): -+ clean_exit(1) -+ -+ if EXISTING_PACKAGE_PATH: -+ downloaded_file = "%s/hplip-%s.run"%(EXISTING_PACKAGE_PATH, HPLIP_latest_ver) -+ digsig_file = "%s/hplip-%s.run.asc"%(EXISTING_PACKAGE_PATH, HPLIP_latest_ver) -+ PATH_TO_DOWNLOAD_INSTALLER = EXISTING_PACKAGE_PATH -+ else: -+ log.debug("\n Calling download_hplip_installer(...) \n") -+ log.debug("\n System Time : %s \n"%datetime.datetime.now().time().isoformat()) -+ -+ if not os.path.exists(PATH_TO_DOWNLOAD_INSTALLER): -+ log.error(log.bold("No such file or directory%s"%PATH_TO_DOWNLOAD_INSTALLER)) -+ download_path = input(log.bold("Please specify the path to download. Press 'q' to quit:")) -+ if download_path == 'q': -+ log.info("User selected to quit.") -+ clean_exit(1) -+ elif not os.path.exists(download_path): -+ log.error(log.bold("Specified path does not exist. Exiting...%s\n"%download_path)) -+ clean_exit(1) -+ elif not os.access(download_path, os.R_OK | os.W_OK): -+ log.error(log.bold("Specified path do not have enough permissions Exiting...%s\n"%download_path)) -+ clean_exit(1) -+ else: -+ PATH_TO_DOWNLOAD_INSTALLER = download_path -+ downloaded_file, digsig_file = download_hplip_installer(PATH_TO_DOWNLOAD_INSTALLER, HPLIP_latest_ver) -+ -+ -+ gpg_obj = validation.GPG_Verification() -+ digsig_sts, error_str = gpg_obj.validate(downloaded_file, digsig_file) -+ -+ if digsig_sts != ERROR_SUCCESS: -+ if digsig_sts in (ERROR_UNABLE_TO_RECV_KEYS, ERROR_DIGITAL_SIGN_NOT_FOUND, ERROR_DIGITAL_SIGN_BAD): -+ if not digital_signature_fail_confirmation(error_str): -+ clean_exit(1) -+ else: -+ log.error(error_str) -+ clean_exit(1) -+ -+ -+ CURRENT_WORKING_DIR = os.getcwd() -+ os.chdir(PATH_TO_DOWNLOAD_INSTALLER) -+ -+ # Installing hplip run. -+ cmd = "sh %s" %(downloaded_file) -+ log.debug("Upgrading %s" % downloaded_file) -+ -+ sts = os_utils.execute(cmd) -+ os.chdir(CURRENT_WORKING_DIR) -+ -+ if sts == 0: -+ log.info(log.bold("Upgrade is Completed.")) -+ else: -+ log.info(log.bold("Upgrade Failed or Skipped. status: %s"%sts)) -+ -+ change_spinner_state(True) -+ mod.unlockInstance() -+ hold_terminal() -+ -+except KeyboardInterrupt: -+ if CURRENT_WORKING_DIR: -+ os.chdir(CURRENT_WORKING_DIR) -+ -+ if not IS_QUIET_MODE: -+ log.error("User exit") -+ -+ clean_exit(1) -+ diff --git a/patches/hplip-3.22.6-manyfixes.patch b/patches/hplip-3.22.6-manyfixes.patch new file mode 100644 index 0000000..0aabf0f --- /dev/null +++ b/patches/hplip-3.22.6-manyfixes.patch @@ -0,0 +1,865 @@ +diff -aruN old/base/sixext.py new/base/sixext.py +--- old/base/sixext.py 2022-06-23 05:56:29.000000000 +0100 ++++ new/base/sixext.py 2022-06-29 13:36:23.970243103 +0100 +@@ -110,11 +110,11 @@ + + + def to_string_utf8(s): +- return s.decode("utf-8") ++ return s.decode("utf-8", 'ignore') + + + def to_string_latin(s): +- return s.decode("latin-1") ++ return s.decode("latin-1", 'ignore') + + + def to_unicode(s, enc=None): +diff -aruN old/configure.in new/configure.in +--- old/configure.in 2022-06-23 05:56:29.000000000 +0100 ++++ new/configure.in 2022-06-29 13:37:21.316908771 +0100 +@@ -620,7 +620,7 @@ + + if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then + AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) +- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) ++ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) + if test "$libusb01_build" = "yes"; then + AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) + AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) +@@ -630,17 +630,29 @@ + fi + fi + +-SAVE_CPPFLAGS="$CPPFLAGS" +-CFLAGS=`python-config --includes` +-if [ $? -eq 0 ] +-then +- echo $FLAGS +-else +-CFLAGS=`python3-config --includes` +- if [ $? -eq 0 ] +- then +- echo $FLAGS +- fi ++AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)]) ++ ++PYTHON_INCLUDES=`$python3_config_path --includes` ++if test "X$PYTHON_INCLUDES" = "X" ; then ++ AC_MSG_ERROR([Cannot get Python includes via python3-config], 6) ++fi ++ ++PYTHON_LIBS=`$python3_config_path --libs` ++if test "X$PYTHON_LIBS" = "X" ; then ++ AC_MSG_ERROR([Cannot get Python libs via python3-config], 6) ++fi ++ ++SAVE_CFLAGS=$CFLAGS ++SAVE_LIBS=$LIBS ++ ++CFLAGS="$CFLAGS $PYTHON_INCLUDES" ++LIBS="$LIBS $PYTHON_LIBS" ++ ++AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6)) ++ ++if test "X$python_includes" != "Xok" ; then ++ CFLAGS="$SAVE_CFLAGS" ++ LIBS="$SAVE_LIBS" + fi + + #CFLAGS=`(python-config --includes)` +@@ -666,7 +678,6 @@ + AS_IF([test "x$FOUND_HEADER" != "xyes"], + [AC_MSG_ERROR([cannot find python-devel support], 6)]) + fi +-CFLAGS="$save_CFLAGS" + + if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then + AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)]) +diff -aruN old/cups_drv.inc new/cups_drv.inc +--- old/cups_drv.inc 2022-06-23 06:04:57.000000000 +0100 ++++ new/cups_drv.inc 2022-06-29 13:36:52.140242600 +0100 +@@ -411,6 +411,7 @@ + ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ ++ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ + ppd/hpcups/hp-laserjet_m1005.ppd.gz \ + ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ + ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \ +@@ -527,6 +528,7 @@ + ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ ++ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \ +diff -aruN old/data/models/models.dat new/data/models/models.dat +--- old/data/models/models.dat 2022-06-23 05:56:29.000000000 +0100 ++++ new/data/models/models.dat 2022-06-29 13:36:52.146909267 +0100 +@@ -2104,7 +2104,7 @@ + usb-vid=3f0 + wifi-config=0 + +-[hp_laserjet_100_colormfp_m175] ++[hp_laserjet_100_colormfp_m175nw] + align-type=0 + clean-type=0 + color-cal-type=0 +@@ -2119,14 +2119,6 @@ + job-storage=0 + linefeed-cal-type=0 + model1=HP LaserJet 100 Color MFP M175 +-model2=HP LaserJet 100 Color MFP M175a +-model3=HP LaserJet 100 Color MFP M175b +-model4=HP LaserJet 100 Color MFP M175c +-model5=HP LaserJet 100 Color MFP M175e +-model6=HP LaserJet 100 Color MFP M175nw +-model7=HP LaserJet 100 Color MFP M175p +-model8=HP LaserJet 100 Color MFP M175q +-model9=HP LaserJet 100 Color MFP M175r + ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd + monitor-type=0 + panel-check-type=0 +@@ -2218,6 +2210,378 @@ + usb-vid=3f0 + wifi-config=3 + ++[hp_laserjet_100_colormfp_m175r] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=14 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=3 ++ ++[hp_laserjet_100_colormfp_m175q] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=14 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=3 ++ ++[hp_laserjet_100_colormfp_m175p] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=14 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=3 ++ ++[hp_laserjet_100_colormfp_m175e] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=2 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=-1 ++ ++[hp_laserjet_100_colormfp_m175a] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++family-ppd=hp-postscript-laserjet-pro.ppd ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=2 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=-1 ++ ++[hp_laserjet_100_colormfp_m175c] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=2 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=-1 ++ ++[hp_laserjet_100_colormfp_m175b] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cm1312_mfp.png ++io-mfp-mode=3 ++io-mode=1 ++io-support=2 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet 100 Color MFP M175 ++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=64 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=3 ++scan-type=5 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=10 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.11.7 ++tech-class=Postscript ++family-class=Undefined ++tech-subclass=Normal ++tech-type=4 ++usb-pid=62a ++usb-vid=3f0 ++wifi-config=-1 ++ + [officejet_100_mobile_l411] + align-type=-1 + clean-type=1 +@@ -17920,6 +18284,58 @@ + usb-vid=3f0 + wifi-config=0 + ++[hp_laserjet_cp_1025nw] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=1 ++fax-type=0 ++fw-download=False ++icon=hp_color_laserjet_cp2025.png ++io-mfp-mode=1 ++io-mode=1 ++io-support=14 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet Pro CP 1025nw Color Printer Series ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=1 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=CE310A ++r0-agent1-type=1 ++r0-agent2-kind=4 ++r0-agent2-sku=CE311A ++r0-agent2-type=4 ++r0-agent3-kind=4 ++r0-agent3-sku=CE313A ++r0-agent3-type=5 ++r0-agent4-kind=4 ++r0-agent4-sku=CE312A ++r0-agent4-type=6 ++scan-src=0 ++scan-type=0 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=8 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.12.4 ++tech-class=LJZjsColor ++family-class=LJ-Class4 ++tech-subclass=Advanced ++tech-type=4 ++usb-pid=112a ++usb-vid=3f0 ++wifi-config=3 ++ + [hp_laserjet_cp1025nw] + align-type=0 + clean-type=0 +@@ -18521,6 +18937,49 @@ + usb-vid=3f0 + wifi-config=0 + ++[hp_laserjet_professional_p1102w] ++align-type=0 ++clean-type=0 ++color-cal-type=0 ++copy-type=0 ++embedded-server-type=0 ++fax-type=0 ++fw-download=False ++icon=HP_LaserJet_1012.png ++io-mfp-mode=6 ++io-mode=1 ++io-support=10 ++job-storage=0 ++linefeed-cal-type=0 ++model1=HP LaserJet Professional P1102w Printer ++monitor-type=0 ++panel-check-type=0 ++pcard-type=0 ++plugin=1 ++plugin-reason=1 ++power-settings=0 ++pq-diag-type=0 ++r-type=0 ++r0-agent1-kind=4 ++r0-agent1-sku=85A ++r0-agent1-type=1 ++scan-src=0 ++scan-type=0 ++status-battery-check=0 ++status-dynamic-counters=0 ++status-type=8 ++support-released=True ++support-subtype=219b2b ++support-type=2 ++support-ver=3.10.4 ++tech-class=LJZjsMono ++family-class=LJ-Class4 ++tech-subclass=NoAutoDuplex ++tech-type=3 ++usb-pid=32a ++usb-vid=3f0 ++wifi-config=3 ++ + [hp_laserjet_professional_p1102] + align-type=0 + clean-type=0 +diff -aruN old/Makefile.in new/Makefile.in +--- old/Makefile.in 2022-06-23 06:05:00.000000000 +0100 ++++ new/Makefile.in 2022-06-29 13:36:52.140242600 +0100 +@@ -1691,6 +1691,7 @@ + ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ ++ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ + ppd/hpcups/hp-laserjet_m1005.ppd.gz \ + ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ + ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \ +@@ -1808,6 +1809,7 @@ + ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ ++ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_250x.ppd.gz \ +@@ -4224,6 +4226,7 @@ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ ++@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \ +@@ -4340,6 +4343,7 @@ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ ++@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \ + @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \ +diff -aruN old/pcard/pcardext/pcardext.c new/pcard/pcardext/pcardext.c +--- old/pcard/pcardext/pcardext.c 2022-06-23 05:56:29.000000000 +0100 ++++ new/pcard/pcardext/pcardext.c 2022-06-29 13:36:38.813576170 +0100 +@@ -20,7 +20,7 @@ + Requires: + Python 2.2+ + +-Author: Don Welch ++Author: Don Welch + + \*****************************************************************************/ + +@@ -41,9 +41,37 @@ + + int verbose=0; + ++#if PY_MAJOR_VERSION >= 3 ++ #define MOD_ERROR_VAL NULL ++ #define MOD_SUCCESS_VAL(val) val ++ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) ++ #define PyInt_AS_LONG PyLong_AS_LONG ++ #define MOD_DEF(ob, name, doc, methods) \ ++ static struct PyModuleDef moduledef = { \ ++ PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \ ++ ob = PyModule_Create(&moduledef); ++ ++ ++ #define PY_String_Bytes PyBytes_FromStringAndSize ++ #define PY_AsString_Bytes PyBytes_AsStringAndSize ++ ++#else ++ #define MOD_ERROR_VAL ++ #define MOD_SUCCESS_VAL(val) ++ #define MOD_INIT(name) void init##name(void) ++ #define MOD_DEF(ob, name, doc, methods) \ ++ ob = Py_InitModule3(name, methods, doc); ++ ++ #define PY_String_Bytes PyString_FromStringAndSize ++ #define PY_AsString_Bytes PyString_AsStringAndSize ++ ++#endif ++ + PyObject * readsectorFunc = NULL; + PyObject * writesectorFunc = NULL; + ++ ++ + int ReadSector(int sector, int nsector, void *buf, int size) + { + PyObject * result; +@@ -59,9 +87,13 @@ + if( result ) + { + Py_ssize_t len = 0; +- PyString_AsStringAndSize( result, &result_str, &len ); ++ ++ //PyString_AsStringAndSize( result, &result_str, &len ); ++ //PyBytes_AsStringAndSize( result, &result_str, &len ); ++ PY_AsString_Bytes( result, &result_str, &len ); + +- if( len < nsector*FAT_HARDSECT ) ++ ++ if( len < nsector*FAT_HARDSECT ) + { + goto abort; + } +@@ -208,7 +240,9 @@ + + if( FatReadFileExt( name, offset, len, buffer ) == len ) + { +- return PyString_FromStringAndSize( (char *)buffer, len ); ++ // return PyString_FromStringAndSize( (char *)buffer, len ); ++ return PY_String_Bytes( (char *)buffer, len ); ++ // return PyBytes_FromStringAndSize( (char *)buffer, len ); + } + else + { +@@ -236,14 +270,15 @@ + + static char pcardext_documentation[] = "Python extension for HP photocard services"; + +-void initpcardext( void ) +-{ +- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods, +- pcardext_documentation, (PyObject*)NULL, +- PYTHON_API_VERSION ); +- +- if (mod == NULL) +- return; ++MOD_INIT(pcardext) { ++ ++ PyObject* mod ; ++ MOD_DEF(mod, "pcardext", pcardext_documentation, pcardext_methods); ++ if (mod == NULL) ++ return MOD_ERROR_VAL; ++ ++ return MOD_SUCCESS_VAL(mod); ++ + } + + +diff -aruN old/prnt/drv/hpcups.drv.in new/prnt/drv/hpcups.drv.in +--- old/prnt/drv/hpcups.drv.in 2022-06-23 06:04:55.000000000 +0100 ++++ new/prnt/drv/hpcups.drv.in 2022-06-29 13:36:52.153575934 +0100 +@@ -22701,6 +22701,14 @@ + Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" + } + { ++ ModelName "HP LaserJet Professional p1102w" ++ Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" ++ Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" ++ PCFileName "hp-laserjet_professional_p1102w.ppd" ++ Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" ++ } ++ { + ModelName "HP LaserJet Professional p1106" + Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version" + Attribute "ShortNickName" "" "HP LJ Pro p1106 hpijs" +@@ -23134,6 +23142,14 @@ + PCFileName "hp-laserjet_cp1025nw.ppd" + Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)" + } ++ { ++ ModelName "HP LaserJet Cp 1025nw" ++ Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin" ++ Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;" ++ PCFileName "hp-laserjet_cp_1025nw.ppd" ++ Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)" ++ } + } + } // End LJZjsColor (for proprietary plugin) + +diff -aruN old/prnt/hpcups/HPCupsFilter.h new/prnt/hpcups/HPCupsFilter.h +--- old/prnt/hpcups/HPCupsFilter.h 2022-06-23 05:56:29.000000000 +0100 ++++ new/prnt/hpcups/HPCupsFilter.h 2022-06-29 13:36:01.853576839 +0100 +@@ -38,6 +38,8 @@ + #include + #include "dbuscomm.h" + ++#include ++ + #define DBITMAPFILEHEADER 14 + #define DBITMAPINFOHEADER 40 + +diff -aruN old/prnt/hpijs/hpcupsfax.cpp new/prnt/hpijs/hpcupsfax.cpp +--- old/prnt/hpijs/hpcupsfax.cpp 2022-06-23 05:56:29.000000000 +0100 ++++ new/prnt/hpijs/hpcupsfax.cpp 2022-06-29 13:36:01.853576839 +0100 +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef FALSE +diff -aruN old/protocol/hp_ipp.c new/protocol/hp_ipp.c +--- old/protocol/hp_ipp.c 2022-06-23 05:56:30.000000000 +0100 ++++ new/protocol/hp_ipp.c 2022-06-29 13:37:05.036909045 +0100 +@@ -110,7 +110,7 @@ + } + + if ( info == NULL ) +- snprintf( info,sizeof(info), name ); ++ snprintf( info, sizeof(info), "%s", name ); + + sprintf( printer_uri, "ipp://localhost/printers/%s", name ); + +@@ -511,27 +511,27 @@ + + if ( strcmp(attr_name, "printer-name") == 0 && + val_tag == IPP_TAG_NAME ) { +- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "device-uri") == 0 && + val_tag == IPP_TAG_URI ) { +- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "printer-uri-supported") == 0 && + val_tag == IPP_TAG_URI ) { +- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "printer-info") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "printer-location") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->location,sizeof(t_printer->location),"%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "printer-make-and-model") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->make_model,sizeof(t_printer->make_model),"%s", ippGetString(attr, 0, NULL) ); + } + else if ( strcmp(attr_name, "printer-state") == 0 && + val_tag == IPP_TAG_ENUM ) { +diff -aruN old/unload.py new/unload.py +--- old/unload.py 2022-06-23 05:56:30.000000000 +0100 ++++ new/unload.py 2022-06-29 13:36:38.813576170 +0100 +@@ -44,6 +44,11 @@ + + # Local + from base.g import * ++from base.sixext import PY3 ++if PY3: ++ log.error("This functionality is not spported in python3 environment.") ++ sys.exit(1) ++ + from base import device, utils, tui, module + from prnt import cups + diff --git a/source-urls b/source-urls index e657840..e16f1c7 100644 --- a/source-urls +++ b/source-urls @@ -62,7 +62,7 @@ https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-37.0. https://cdn.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz https://www.openprinting.org/download/cups-filters/cups-filters-1.28.15.tar.xz -https://curl.se/download/curl-7.83.1.tar.xz +https://curl.se/download/curl-7.84.0.tar.xz https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz https://github.com/cython/cython/releases/download/0.29.25-1/Cython-0.29.25.tar.gz http://videolan.mirrors.nublue.co.uk/dav1d/1.0.0/dav1d-1.0.0.tar.xz @@ -115,8 +115,8 @@ https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz https://deb.debian.org/debian/pool/main/f/figlet/figlet_2.2.5.orig.tar.gz https://astron.com/pub/file/file-5.42.tar.gz https://mirror.lyrahosting.com/gnu/findutils/findutils-4.9.0.tar.xz -https://archive.mozilla.org/pub/firefox/releases/91.10.0esr/source/firefox-91.10.0esr.source.tar.xz -https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/en-US/firefox-101.0.1.tar.bz2 +https://archive.mozilla.org/pub/firefox/releases/91.11.0esr/source/firefox-91.11.0esr.source.tar.xz +https://archive.mozilla.org/pub/firefox/releases/102.0/linux-x86_64/en-US/firefox-102.0.tar.bz2 https://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz https://github.com/flatpak/flatpak/releases/download/1.13.2/flatpak-1.13.2.tar.xz https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz @@ -141,7 +141,7 @@ https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/g https://archive.massos.org/sources/ghostscript-fonts-std-8.11.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/gi-docgen/2022/gi-docgen-2022.1.tar.xz https://archive.massos.org/sources/giflib-5.2.1.tar.gz -https://cdn.kernel.org/pub/software/scm/git/git-2.36.1.tar.xz +https://cdn.kernel.org/pub/software/scm/git/git-2.37.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.2.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz https://mirror.lyrahosting.com/gnu/glibc/glibc-2.35.tar.xz @@ -186,9 +186,9 @@ https://ftp.acc.umu.se/pub/gnome/sources/gvfs/1.50/gvfs-1.50.2.tar.xz https://github.com/chromium/gyp/archive/9ecf45/gyp-9ecf45.tar.gz https://archive.massos.org/sources/gz2xz-1.0.2.tar.gz https://mirror.lyrahosting.com/gnu/gzip/gzip-1.12.tar.xz -https://github.com/harfbuzz/harfbuzz/releases/download/4.3.0/harfbuzz-4.3.0.tar.xz +https://github.com/harfbuzz/harfbuzz/releases/download/4.4.1/harfbuzz-4.4.1.tar.xz https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.tar.xz -https://mirror.lyrahosting.com/gentoo/distfiles/hplip-3.22.2.tar.gz +https://freefr.dl.sourceforge.net/project/hplip/hplip/3.22.6/hplip-3.22.6.tar.gz https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz https://mirror.lyrahosting.com/gnu/help2man/help2man-1.49.2.tar.xz https://github.com/vcrhonek/hwdata/archive/v0.360/hwdata-0.360.tar.gz @@ -372,7 +372,7 @@ https://www.x.org/archive/individual/lib/libXxf86vm-1.1.4.tar.bz2 https://libzip.org/download/libzip-1.8.0.tar.xz https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz -https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.7.tar.xz +https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.8.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/lld-14.0.6.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-14.0.6.src.tar.xz @@ -414,7 +414,7 @@ https://mirror.netcologne.de/xfce/src/apps/mousepad/0.5/mousepad-0.5.9.tar.bz2 https://mirror.lyrahosting.com/gnu/mpc/mpc-1.2.1.tar.gz https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz https://mirror.lyrahosting.com/gnu/mpfr/mpfr-4.1.0.tar.xz -https://mpg123.org/download/mpg123-1.29.3.tar.bz2 +https://mpg123.org/download/mpg123-1.30.0.tar.bz2 https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2 https://mirror.lyrahosting.com/gnu/mtools/mtools-4.0.40.tar.gz https://github.com/bluesabre/mugshot/releases/download/mugshot-0.4.3/mugshot-0.4.3.tar.gz @@ -438,7 +438,7 @@ https://archive.mozilla.org/pub/nspr/releases/v4.34/src/nspr-4.34.tar.gz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_80_RTM/src/nss-3.80.tar.gz https://github.com/tuxera/ntfs-3g/archive/2022.5.17/ntfs-3g-2022.5.17.tar.gz https://github.com/NVIDIA/open-gpu-kernel-modules/archive/515.43.04/open-gpu-kernel-modules-515.43.04.tar.gz -https://github.com/kcat/openal-soft/archive/1.21.1/openal-soft-1.21.1.tar.gz +https://github.com/kcat/openal-soft/archive/1.22.2/openal-soft-1.22.2.tar.gz https://github.com/cisco/openh264/archive/v2.1.1/openh264-2.1.1.tar.gz https://archive.massos.org/sources/openjade-1.3.2.tar.gz https://github.com/uclouvain/openjpeg/archive/v2.5.0/openjpeg-2.5.0.tar.gz @@ -539,9 +539,9 @@ https://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz https://archive.massos.org/workdev/sphinx-4.5.0-x86_64-venv.tar.xz https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.216.0/SPIRV-Headers-sdk-1.3.216.0.tar.gz https://github.com/KhronosGroup/SPIRV-Tools/archive/v2022.2/SPIRV-Tools-2022.2.tar.gz -https://sqlite.org/2022/sqlite-autoconf-3380500.tar.gz +https://sqlite.org/2022/sqlite-autoconf-3390000.tar.gz https://github.com/plougher/squashfs-tools/archive/4.5.1/squashfs-tools-4.5.1.tar.gz -https://github.com/vasi/squashfuse/releases/download/0.1.104/squashfuse-0.1.104.tar.gz +https://github.com/vasi/squashfuse/archive/0.1.105/squashfuse-0.1.105.tar.gz https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.3/sshfs-3.7.3.tar.xz https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz https://www.sudo.ws/sudo/dist/sudo-1.9.11p3.tar.gz @@ -577,7 +577,7 @@ https://lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2 https://cdn.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.tar.xz https://www.x.org/archive/individual/util/util-macros-1.19.3.tar.bz2 https://ftp.acc.umu.se/pub/gnome/sources/vala/0.56/vala-0.56.1.tar.xz -https://github.com/vim/vim/archive/v8.2.5046/vim-8.2.5046.tar.gz +https://github.com/vim/vim/archive/v9.0.0000/vim-9.0.0000.tar.gz https://deb.debian.org/debian/pool/main/v/vitetris/vitetris_0.59.1.orig.tar.gz https://github.com/Netflix/vmaf/archive/v2.3.0/vmaf-2.3.0.tar.gz https://github.com/felixonmars/volume_key/archive/volume_key-0.3.12.tar.gz diff --git a/stage1.sh b/stage1.sh index 2f21065..7a80a5c 100755 --- a/stage1.sh +++ b/stage1.sh @@ -72,14 +72,14 @@ cat gcc/limitx.h gcc/glimits.h gcc/limity.h > `dirname $($MASSOS_TARGET-gcc -pri cd .. rm -rf gcc-12.1.0 # Linux API Headers. -tar -xf linux-5.18.7.tar.xz -cd linux-5.18.7 +tar -xf linux-5.18.8.tar.xz +cd linux-5.18.8 make headers find usr/include -name '.*' -delete rm usr/include/Makefile cp -r usr/include "$MASSOS"/usr cd .. -rm -rf linux-5.18.7 +rm -rf linux-5.18.8 # Glibc tar -xf glibc-2.35.tar.xz cd glibc-2.35 diff --git a/utils/build-configs/kernel-config b/utils/build-configs/kernel-config index e73ca75..7dd257a 100644 --- a/utils/build-configs/kernel-config +++ b/utils/build-configs/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.7 Kernel Configuration +# Linux/x86 5.18.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (MassOS GCC) 12.1.0" CONFIG_CC_IS_GCC=y From 0d541cdb02a92780af0442c5f50d808fb1d8cfac Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Thu, 30 Jun 2022 18:09:46 +0100 Subject: [PATCH 26/32] Try to make builds reproducible --- build-system.sh | 2 +- stage1.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-system.sh b/build-system.sh index f4d061a..286f970 100755 --- a/build-system.sh +++ b/build-system.sh @@ -532,7 +532,7 @@ tar -xf gcc-12.1.0.tar.xz cd gcc-12.1.0 sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 mkdir build; cd build -CFLAGS="-O2" CXXFLAGS="-O2" LD=ld ../configure --prefix=/usr --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-system-zlib --enable-default-ssp --disable-bootstrap --disable-multilib +CFLAGS="-O2" CXXFLAGS="-O2" LD=ld ../configure --prefix=/usr --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-system-zlib --enable-default-ssp --enable-linker-build-id --disable-bootstrap --disable-multilib make make install rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/$(gcc -dumpversion)/include-fixed/bits/ diff --git a/stage1.sh b/stage1.sh index 7a80a5c..c291342 100755 --- a/stage1.sh +++ b/stage1.sh @@ -64,7 +64,7 @@ mv mpfr-4.1.0 mpfr tar -xf ../mpc-1.2.1.tar.gz mv mpc-1.2.1 mpc mkdir build; cd build -CFLAGS="-O2" CXXFLAGS="-O2" ../configure --target=$MASSOS_TARGET --prefix="$MASSOS"/tools --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-glibc-version=2.11 --with-sysroot="$MASSOS" --with-newlib --without-headers --enable-default-ssp --enable-initfini-array --disable-nls --disable-shared --disable-multilib --disable-decimal-float --disable-threads --disable-libatomic --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libstdcxx +CFLAGS="-O2" CXXFLAGS="-O2" ../configure --target=$MASSOS_TARGET --prefix="$MASSOS"/tools --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-glibc-version=2.11 --with-sysroot="$MASSOS" --with-newlib --without-headers --enable-default-ssp --enable-initfini-array --enable-linker-build-id --disable-nls --disable-shared --disable-multilib --disable-decimal-float --disable-threads --disable-libatomic --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libstdcxx make make install cd .. @@ -261,7 +261,7 @@ tar -xf ../mpc-1.2.1.tar.gz mv mpc-1.2.1 mpc sed -i '/thread_header =/s/@.*@/gthr-posix.h/' libgcc/Makefile.in libstdc++-v3/include/Makefile.in mkdir build; cd build -CFLAGS="-O2" CXXFLAGS="-O2" ../configure --prefix=/usr --build=$(../config.guess) --host=$MASSOS_TARGET CC_FOR_TARGET=$MASSOS_TARGET-gcc LDFLAGS_FOR_TARGET=-L"$PWD/$MASSOS_TARGET/libgcc" --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-build-sysroot="$MASSOS" --enable-default-ssp --enable-initfini-array --disable-nls --disable-multilib --disable-decimal-float --disable-libatomic --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv +CFLAGS="-O2" CXXFLAGS="-O2" ../configure --prefix=/usr --build=$(../config.guess) --host=$MASSOS_TARGET CC_FOR_TARGET=$MASSOS_TARGET-gcc LDFLAGS_FOR_TARGET=-L"$PWD/$MASSOS_TARGET/libgcc" --enable-languages=c,c++ --with-pkgversion="MassOS GCC" --with-build-sysroot="$MASSOS" --enable-default-ssp --enable-initfini-array --enable-linker-build-id --disable-nls --disable-multilib --disable-decimal-float --disable-libatomic --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv make make DESTDIR="$MASSOS" install ln -sf gcc "$MASSOS"/usr/bin/cc From 730c49385c21ac771ae3c764184520d287d056a3 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Thu, 30 Jun 2022 20:54:52 +0100 Subject: [PATCH 27/32] Minor build fix --- build-system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-system.sh b/build-system.sh index 286f970..dcc2123 100755 --- a/build-system.sh +++ b/build-system.sh @@ -2713,7 +2713,7 @@ patch -Np1 -i ../patches/audit-3.0.7-WorkaroundBuildIssue.patch ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-gssapi-krb5=yes --enable-systemd=yes ACFLAGS="-D_REENTRANT -D_GNU_SOURCE" ALDFLAGS="-Wl,-z,relro,-z,now" -make auditd_CFLAGS="$ACFLAGS -fno-strict-aliasing -pthread" auditctl_CFLAGS="$ACFLAGS" audisp_remote_CFLAGS="$ACFLAGS" audisp_syslog_CFLAGS="$ACFLAGS" audispd_zos_remote_CFLAGS="$ACFLAGS" auditd_LDFLAGS="$ALDFLAGS" auditctl_LDFLAGS="$ALDFLAGS" audispd-zos-remote_LDFLAGS="$ALDFLAGS" audisp_remote_LDFLAGS="$ALDFLAGS" audisp_syslog_LDFLAGS="$ALDFLAGS" +make auditd_CFLAGS="$ACFLAGS -fno-strict-aliasing -pthread" auditctl_CFLAGS="$ACFLAGS" audisp_remote_CFLAGS="$ACFLAGS" audisp_syslog_CFLAGS="$ACFLAGS" audispd_zos_remote_CFLAGS="$ACFLAGS" auditd_LDFLAGS="$ALDFLAGS" auditctl_LDFLAGS="$ALDFLAGS" audispd_zos_remote_LDFLAGS="$ALDFLAGS" audisp_remote_LDFLAGS="$ALDFLAGS" audisp_syslog_LDFLAGS="$ALDFLAGS" unset ACFLAGS ALDFLAGS make install sed -i 's|"audit.h"||' /usr/include/libaudit.h From 23072ebb399688a4421ba834da6f3c573a25f24f Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Thu, 30 Jun 2022 23:43:59 +0100 Subject: [PATCH 28/32] More updates and fixes --- build-system.sh | 38 +++++++++++++++++++------------------- changelog.md | 6 ++++-- source-urls | 8 ++++---- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/build-system.sh b/build-system.sh index dcc2123..0b8cf8f 100755 --- a/build-system.sh +++ b/build-system.sh @@ -3929,14 +3929,14 @@ install -t /usr/share/licenses/vulkan-tools -Dm644 ../LICENSE.txt cd ../.. rm -rf Vulkan-Tools-1.3.217 # libva (circular dependency; will be rebuilt later to support Mesa). -tar -xf libva-2.14.0.tar.bz2 -cd libva-2.14.0 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static +tar -xf libva-2.15.0.tar.gz +cd libva-2.15.0 +./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make make install install -t /usr/share/licenses/libva -Dm644 COPYING cd .. -rm -rf libva-2.14.0 +rm -rf libva-2.15.0 # libvdpau. tar -xf libvdpau-1.5.tar.bz2 cd libvdpau-1.5 @@ -3969,13 +3969,14 @@ install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst cd ../.. rm -rf mesa-22.1.2 # libva (rebuild to support Mesa). -tar -xf libva-2.14.0.tar.bz2 -cd libva-2.14.0 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static +tar -xf libva-2.15.0.tar.gz +cd libva-2.15.0 +./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make make install +install -t /usr/share/licenses/libva -Dm644 COPYING cd .. -rm -rf libva-2.14.0 +rm -rf libva-2.15.0 # xbitmaps. tar -xf xbitmaps-1.1.2.tar.bz2 cd xbitmaps-1.1.2 @@ -4705,7 +4706,7 @@ sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac ./autogen.sh ./configure --prefix=/usr --disable-php --enable-lefty --with-webp make -make install +make -j1 install install -t /usr/share/licenses/graphviz -Dm644 COPYING cd .. rm -rf graphviz-4.0.0 @@ -6063,16 +6064,16 @@ install -t /usr/share/licenses/mpg123 -Dm644 COPYING cd .. rm -rf mpg123-1.30.0 # libvpx. -tar -xf libvpx_1.11.0.orig.tar.gz -cd libvpx-1.11.0 +tar -xf libvpx-1.12.0.tar.gz +cd libvpx-1.12.0 sed -i 's/cp -p/cp/' build/make/Makefile -mkdir WEBMPROJECT-VPX-build; cd WEBMPROJECT-VPX-build -../configure --prefix=/usr --enable-shared --disable-static +mkdir libvpx-build; cd libvpx-build +../configure --prefix=/usr --enable-shared --disable-static --disable-examples --disable-unit-tests make make install install -t /usr/share/licenses/libvpx -Dm644 ../LICENSE cd ../.. -rm -rf libvpx-1.11.0 +rm -rf libvpx-1.12.0 # LAME. tar -xf lame3_100.tar.gz cd LAME-lame3_100 @@ -6366,9 +6367,8 @@ install -t /usr/share/licenses/gstreamer-vaapi -Dm644 ../COPYING.LIB cd ../.. rm -rf gstreamer-vaapi-1.20.3 # PipeWire + WirePlumber. -tar -xf pipewire-0.3.52.tar.gz -cd pipewire-0.3.52 -patch -Np1 -i ../patches/pipewire-0.3.52-upstreamfix.patch +tar -xf pipewire-0.3.53.tar.gz +cd pipewire-0.3.53 mkdir -p subprojects/wireplumber tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1 mkdir pipewire-build; cd pipewire-build @@ -6381,7 +6381,7 @@ echo "autospawn = no" >> /etc/pulse/client.conf install -t /usr/share/licenses/pipewire -Dm644 ../COPYING install -t /usr/share/licenses/wireplumber -Dm644 ../subprojects/wireplumber/LICENSE cd ../.. -rm -rf pipewire-0.3.52 +rm -rf pipewire-0.3.53 # xdg-desktop-portal. tar -xf xdg-desktop-portal-1.14.4.tar.xz cd xdg-desktop-portal-1.14.4 @@ -7048,7 +7048,7 @@ cat > /usr/share/licenses/firefox/LICENSE << "END" Please type 'about:license' in the Firefox URL box to view the Firefox license. END # Thunderbird. -tar --no-same-owner -xf thunderbird-91.10.0.tar.bz2 -C /usr/lib +tar --no-same-owner -xf thunderbird-102.0.tar.bz2 -C /usr/lib mkdir -p /usr/lib/thunderbird/distribution cat > /usr/lib/thunderbird/distribution/policies.json << END { diff --git a/changelog.md b/changelog.md index 8ce9771..9d668c9 100644 --- a/changelog.md +++ b/changelog.md @@ -40,6 +40,8 @@ Upgraded software: - libostree: `2022.3 --> 2022.4` - libqmi: `1.30.6 --> 1.30.8` - librsvg: `2.54.3 --> 2.54.4` +- libva: `2.14.0 --> 2.15.0` +- libvpx: `1.11.0 --> 1.12.0` - libX11: `1.8 --> 1.8.1` - Linux Kernel: `5.18.1 --> 5.18.8` - LLVM/Clang/LLD: `14.0.4 --> 14.0.6` @@ -56,7 +58,7 @@ Upgraded software: - ntfs-3g: `2021.8.22 --> 2022.5.17` - OpenAL: `1.21.1 --> 1.22.2` - OpenSSL: `3.0.3 --> 3.0.4` -- PipeWire: `0.3.51 --> 0.3.52` +- PipeWire: `0.3.51 --> 0.3.53` - Poppler: `22.05.0 --> 22.06.0` - PulseAudio: `16.0 --> 16.1` - Python: `3.10.4 --> 3.10.5` @@ -70,7 +72,7 @@ Upgraded software: - squashfuse: `0.1.104 --> 0.1.105` - Sudo: `1.9.10 --> 1.9.11p3` - systemd: `251.1 --> 251.2` -- Thunderbird: `91.9.1 --> 91.10.0` +- Thunderbird: `91.9.1 --> 102.0` - UPower: `0.99.18 --> 0.99.19` - Vim: `8.2.5046 --> 9.0.0000` - Vulkan-Headers: `1.3.213 --> 1.3.217` diff --git a/source-urls b/source-urls index e16f1c7..5addbb7 100644 --- a/source-urls +++ b/source-urls @@ -325,10 +325,10 @@ https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.1.tar.bz2 https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2 https://dist.libuv.org/dist/v1.44.1/libuv-v1.44.1.tar.gz -https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2 +https://github.com/intel/libva/archive/2.15.0/libva-2.15.0.tar.gz https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.5/libvdpau-1.5.tar.bz2 https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz -https://deb.debian.org/debian/pool/main/libv/libvpx/libvpx_1.11.0.orig.tar.gz +https://github.com/webmproject/libvpx/archive/v1.12.0/libvpx-1.12.0.tar.gz https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.2.0/libwacom-2.2.0.tar.xz https://github.com/webmproject/libwebp/archive/v1.2.2/libwebp-1.2.2.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/libwnck/40/libwnck-40.1.tar.xz @@ -472,7 +472,7 @@ https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.29.0/p https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz https://deb.debian.org/debian/pool/main/p/pigz/pigz_2.6.orig.tar.xz https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2 -https://github.com/PipeWire/pipewire/archive/0.3.52/pipewire-0.3.52.tar.gz +https://github.com/PipeWire/pipewire/archive/0.3.53/pipewire-0.3.53.tar.gz https://www.cairographics.org/releases/pixman-0.40.0.tar.gz https://files.pythonhosted.org/packages/source/p/ply/ply-3.11.tar.gz https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz @@ -557,7 +557,7 @@ https://archive.massos.org/sources/thin-provisioning-tools-0.9.0.tar.gz https://mirror.netcologne.de/xfce/src/xfce/thunar/4.17/thunar-4.17.8.tar.bz2 https://mirror.netcologne.de/xfce/src/thunar-plugins/thunar-archive-plugin/0.5/thunar-archive-plugin-0.5.0.tar.bz2 https://mirror.netcologne.de/xfce/src/xfce/thunar-volman/4.16/thunar-volman-4.16.0.tar.bz2 -https://archive.mozilla.org/pub/thunderbird/releases/91.10.0/linux-x86_64/en-US/thunderbird-91.10.0.tar.bz2 +https://archive.mozilla.org/pub/thunderbird/releases/102.0/linux-x86_64/en-US/thunderbird-102.0.tar.bz2 https://archive.massos.org/sources/tk8.6.12-src.tar.gz https://files.pythonhosted.org/packages/source/t/toml/toml-0.10.2.tar.gz https://github.com/tpm2-software/tpm2-tss/releases/download/3.2.0/tpm2-tss-3.2.0.tar.gz From 3102494825b5e5a0790045660eb336d5df215707 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Fri, 1 Jul 2022 12:20:35 +0100 Subject: [PATCH 29/32] Rework the shell startup files --- utils/etc/bashrc | 59 +-------- utils/etc/dircolors | 195 ------------------------------ utils/etc/fstab | 4 +- utils/etc/profile | 107 +++++++++------- utils/etc/profile.d/README | 5 + utils/etc/profile.d/dircolors.sh | 11 -- utils/etc/profile.d/extrapaths.sh | 6 - utils/etc/profile.d/i18n.sh | 3 - utils/etc/profile.d/readline.sh | 5 - utils/etc/profile.d/umask.sh | 6 - utils/etc/skel/.bash_logout | 5 +- utils/etc/skel/.bash_profile | 19 +-- utils/etc/skel/.bashrc | 18 ++- utils/etc/skel/.profile | 14 +-- 14 files changed, 90 insertions(+), 367 deletions(-) delete mode 100644 utils/etc/dircolors create mode 100644 utils/etc/profile.d/README delete mode 100644 utils/etc/profile.d/dircolors.sh delete mode 100644 utils/etc/profile.d/extrapaths.sh delete mode 100644 utils/etc/profile.d/i18n.sh delete mode 100644 utils/etc/profile.d/readline.sh delete mode 100644 utils/etc/profile.d/umask.sh diff --git a/utils/etc/bashrc b/utils/etc/bashrc index 5257faa..2093255 100644 --- a/utils/etc/bashrc +++ b/utils/etc/bashrc @@ -1,57 +1,4 @@ -# System wide aliases and functions. - -# System wide environment variables and startup programs should go into -# /etc/profile. Personal environment variables and startup programs -# should go into ~/.bash_profile. Personal aliases and functions should -# go into ~/.bashrc - -# Provides colored /bin/ls and /bin/grep commands. Used in conjunction -# with code in /etc/profile. - -alias ls='ls --color=auto' -alias grep='grep --color=auto' - -# Provides prompt for non-login shells, specifically shells started -# in the X environment. - -NORMAL="\[\e[0m\]" -RED="\[\e[1;31m\]" -GREEN="\[\e[1;32m\]" -BLUE="\[\e[1;34m\]" -if [[ $EUID == 0 ]] ; then - PS1="$RED\u@\h$NORMAL:$BLUE\w$NORMAL# " -else - PS1="$GREEN\u@\h$NORMAL:$BLUE\w$NORMAL\$ " +# Just load /etc/profile, it has what we need. +if [ -f /etc/profile ]; then + . /etc/profile fi - -unset RED GREEN BLUE NORMAL - -# Fixes colours for all 'ls' files when non-root. - -LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:' -LS_COLORS+='bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:' -LS_COLORS+='ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:' -LS_COLORS+='*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:' -LS_COLORS+='*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:' -LS_COLORS+='*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:' -LS_COLORS+='*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:' -LS_COLORS+='*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:' -LS_COLORS+='*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:' -LS_COLORS+='*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:' -LS_COLORS+='*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:' -LS_COLORS+='*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:' -LS_COLORS+='*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:' -LS_COLORS+='*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:' -LS_COLORS+='*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:' -LS_COLORS+='*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:' -LS_COLORS+='*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:' -LS_COLORS+='*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:' -LS_COLORS+='*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:' -LS_COLORS+='*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:' -LS_COLORS+='*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:' -LS_COLORS+='*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:' -LS_COLORS+='*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:' -LS_COLORS+='*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:' -LS_COLORS+='*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:' -LS_COLORS+='*.xspf=00;36:' -export LS_COLORS diff --git a/utils/etc/dircolors b/utils/etc/dircolors deleted file mode 100644 index 24039d5..0000000 --- a/utils/etc/dircolors +++ /dev/null @@ -1,195 +0,0 @@ -# Configuration file for dircolors, a utility to help you set the -# LS_COLORS environment variable used by GNU ls with the --color option. -# Copyright (C) 1996-2020 Free Software Foundation, Inc. -# Copying and distribution of this file, with or without modification, -# are permitted provided the copyright notice and this notice are preserved. -# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the -# slackware version of dircolors) are recognized but ignored. -# Below are TERM entries, which can be a glob patterns, to match -# against the TERM environment variable to determine if it is colorizable. -TERM Eterm -TERM ansi -TERM *color* -TERM con[0-9]*x[0-9]* -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM gnome -TERM hurd -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mlterm -TERM putty -TERM rxvt* -TERM screen* -TERM st -TERM terminator -TERM tmux* -TERM vt100 -TERM xterm* -# Below are the color init strings for the basic file types. -# One can use codes for 256 or more colors supported by modern terminals. -# The default color codes use the capabilities of an 8 color terminal -# with some additional attributes as per the following codes: -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white -# Background color codes: -# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white -#NORMAL 00 # no color code at all -#FILE 00 # regular file: use no color at all -RESET 0 # reset to "normal" color -DIR 01;34 # directory -LINK 01;36 # symbolic link. (If you set this to 'target' instead of a - # numerical value, the color is as for the file pointed to.) -MULTIHARDLINK 00 # regular file with more than one link -FIFO 40;33 # pipe -SOCK 01;35 # socket -DOOR 01;35 # door -BLK 40;33;01 # block device driver -CHR 40;33;01 # character device driver -ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ... -MISSING 00 # ... and the files they point to -SETUID 37;41 # file that is setuid (u+s) -SETGID 30;43 # file that is setgid (g+s) -CAPABILITY 30;41 # file with capability -STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) -OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky -STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable -# This is for files with execute permission: -EXEC 01;32 -# List any file extensions like '.gz' or '.tar' that you would like ls -# to colorize below. Put the extension, a space, and the color init string. -# (and any comments you want to add after a '#') -# If you use DOS-style suffixes, you may want to uncomment the following: -#.cmd 01;32 # executables (bright green) -#.exe 01;32 -#.com 01;32 -#.btm 01;32 -#.bat 01;32 -# Or if you want to colorize scripts even if they do not have the -# executable bit actually set. -#.sh 01;32 -#.csh 01;32 - # archives or compressed (bright red) -.tar 01;31 -.tgz 01;31 -.arc 01;31 -.arj 01;31 -.taz 01;31 -.lha 01;31 -.lz4 01;31 -.lzh 01;31 -.lzma 01;31 -.tlz 01;31 -.txz 01;31 -.tzo 01;31 -.t7z 01;31 -.zip 01;31 -.z 01;31 -.dz 01;31 -.gz 01;31 -.lrz 01;31 -.lz 01;31 -.lzo 01;31 -.xz 01;31 -.zst 01;31 -.tzst 01;31 -.bz2 01;31 -.bz 01;31 -.tbz 01;31 -.tbz2 01;31 -.tz 01;31 -.deb 01;31 -.rpm 01;31 -.jar 01;31 -.war 01;31 -.ear 01;31 -.sar 01;31 -.rar 01;31 -.alz 01;31 -.ace 01;31 -.zoo 01;31 -.cpio 01;31 -.7z 01;31 -.rz 01;31 -.cab 01;31 -.wim 01;31 -.swm 01;31 -.dwm 01;31 -.esd 01;31 -# image formats -.jpg 01;35 -.jpeg 01;35 -.mjpg 01;35 -.mjpeg 01;35 -.gif 01;35 -.bmp 01;35 -.pbm 01;35 -.pgm 01;35 -.ppm 01;35 -.tga 01;35 -.xbm 01;35 -.xpm 01;35 -.tif 01;35 -.tiff 01;35 -.png 01;35 -.svg 01;35 -.svgz 01;35 -.mng 01;35 -.pcx 01;35 -.mov 01;35 -.mpg 01;35 -.mpeg 01;35 -.m2v 01;35 -.mkv 01;35 -.webm 01;35 -.webp 01;35 -.ogm 01;35 -.mp4 01;35 -.m4v 01;35 -.mp4v 01;35 -.vob 01;35 -.qt 01;35 -.nuv 01;35 -.wmv 01;35 -.asf 01;35 -.rm 01;35 -.rmvb 01;35 -.flc 01;35 -.avi 01;35 -.fli 01;35 -.flv 01;35 -.gl 01;35 -.dl 01;35 -.xcf 01;35 -.xwd 01;35 -.yuv 01;35 -.cgm 01;35 -.emf 01;35 -# https://wiki.xiph.org/MIME_Types_and_File_Extensions -.ogv 01;35 -.ogx 01;35 -# audio formats -.aac 00;36 -.au 00;36 -.flac 00;36 -.m4a 00;36 -.mid 00;36 -.midi 00;36 -.mka 00;36 -.mp3 00;36 -.mpc 00;36 -.ogg 00;36 -.ra 00;36 -.wav 00;36 -# https://wiki.xiph.org/MIME_Types_and_File_Extensions -.oga 00;36 -.opus 00;36 -.spx 00;36 -.xspf 00;36 diff --git a/utils/etc/fstab b/utils/etc/fstab index e6dbde6..f6a9dec 100644 --- a/utils/etc/fstab +++ b/utils/etc/fstab @@ -1,4 +1,6 @@ -# File system table - list of filesystems to be automounted at boot time. +# This file will be autogenerated by the MassOS installer. If you're seeing +# this message, it's most likely because you are manually installing MassOS. +# If this is the case, BE CAREFUL! ERRORS IN THIS FILE CAN PREVENT BOOTING! # Uncomment the root filesystem line and any other lines you need. # BE SURE TO REPLACE THE 'x' PLACEHOLDERS WITH THE UUID OF YOUR PARTITION. diff --git a/utils/etc/profile b/utils/etc/profile index 3e34779..2460c10 100644 --- a/utils/etc/profile +++ b/utils/etc/profile @@ -1,66 +1,81 @@ -# System wide environment variables and startup programs. +# Directly modifying this file is discouraged; put your custom startup files in +# /etc/profile.d instead (the files there also take more priority than this). -# System wide aliases and functions should go in /etc/bashrc. Personal -# environment variables and startup programs should go into -# ~/.bash_profile. Personal aliases and functions should go into -# ~/.bashrc. - -# Functions to help us manage paths. Second argument is the name of the -# path variable to be modified (default: PATH) -pathremove () { - local IFS=':' - local NEWPATH - local DIR - local PATHVARIABLE=${2:-PATH} - for DIR in ${!PATHVARIABLE} ; do - if [ "$DIR" != "$1" ] ; then - NEWPATH=${NEWPATH:+$NEWPATH:}$DIR - fi - done - export $PATHVARIABLE="$NEWPATH" -} - -pathprepend () { - pathremove $1 $2 - local PATHVARIABLE=${2:-PATH} - export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}" -} - -pathappend () { - pathremove $1 $2 - local PATHVARIABLE=${2:-PATH} - export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1" -} - -export -f pathremove pathprepend pathappend - -# Set the initial path -export PATH=/usr/bin:/usr/sbin - -# Setup some environment variables. +# Set up environment variables. +export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin +export PKG_CONFIG_PATH=/usr/local/share/pkgconfig:/usr/local/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig export HISTSIZE=1000 export HISTIGNORE="&:[bf]g:exit" - -# Set some defaults for graphical systems export XDG_DATA_DIRS=${XDG_DATA_DIRS:-/usr/share/} export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS:-/etc/xdg/} export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp/xdg-$USER} -# Setup a red prompt for root and a green one for users. +# Set up localization. +. /etc/locale.conf +export LANG + +# Set up INPUTRC. +if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then + export INPUTRC=/etc/inputrc +fi + +# PS1 prompt for login shells. NORMAL="\[\e[0m\]" RED="\[\e[1;31m\]" GREEN="\[\e[1;32m\]" BLUE="\[\e[1;34m\]" -if [[ $EUID == 0 ]] ; then +if [ $EUID -eq 0 ]; then PS1="$RED\u@\h$NORMAL:$BLUE\w$NORMAL# " else PS1="$GREEN\u@\h$NORMAL:$BLUE\w$NORMAL\$ " fi +unset NORMAL RED GREEN BLUE + +# Set the umask. +if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ]; then + umask 002 +else + umask 022 +fi + +# Allow ls and grep to support colored output. +if [ -f "/etc/dircolors" ]; then + eval $(dircolors -b /etc/dircolors) +fi +if [ -f "$HOME/.dircolors" ]; then + eval $(dircolors -b $HOME/.dircolors) +fi +alias ls='ls --color=auto' +alias grep='grep --color=auto' + +# Useful path management functions based on the ones from LFS. +pathappend() { + pathremove $1 $2 + local PATHVARIABLE=${2:-PATH} + export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1" +} +pathprepend() { + pathremove $1 $2 + local PATHVARIABLE=${2:-PATH} + export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}" +} +pathremove() { + local IFS=':' + local NEWPATH + local DIR + local PATHVARIABLE=${2:-PATH} + for DIR in ${!PATHVARIABLE} ; do + if [ "$DIR" != "$1" ]; then + NEWPATH=${NEWPATH:+$NEWPATH:}$DIR + fi + done + export $PATHVARIABLE="$NEWPATH" +} +export -f pathremove pathprepend pathappend +# Load drop-in startup files from /etc/profile.d. for script in /etc/profile.d/*.sh ; do - if [ -r $script ] ; then + if [ -r $script ]; then . $script fi done - -unset script NORMAL RED GREEN BLUE diff --git a/utils/etc/profile.d/README b/utils/etc/profile.d/README new file mode 100644 index 0000000..3d29c8e --- /dev/null +++ b/utils/etc/profile.d/README @@ -0,0 +1,5 @@ +System-wide shell startup files go here. + +They take higher priority than /etc/profile. + +Files here without a *.sh extension (like this one) will be ignored. diff --git a/utils/etc/profile.d/dircolors.sh b/utils/etc/profile.d/dircolors.sh deleted file mode 100644 index 4f865cf..0000000 --- a/utils/etc/profile.d/dircolors.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Setup for 'ls' and 'grep' to support color, the alias is in /etc/bashrc. -if [ -f "/etc/dircolors" ] ; then - eval $(dircolors -b /etc/dircolors) -fi - -if [ -f "$HOME/.dircolors" ] ; then - eval $(dircolors -b $HOME/.dircolors) -fi - -alias ls='ls --color=auto' -alias grep='grep --color=auto' diff --git a/utils/etc/profile.d/extrapaths.sh b/utils/etc/profile.d/extrapaths.sh deleted file mode 100644 index 242c189..0000000 --- a/utils/etc/profile.d/extrapaths.sh +++ /dev/null @@ -1,6 +0,0 @@ -pathprepend /usr/local/lib/pkgconfig PKG_CONFIG_PATH -pathprepend /usr/local/share/pkgconfig PKG_CONFIG_PATH -pathprepend /usr/local/sbin -pathprepend /usr/local/bin -pathappend /usr/share/man MANPATH -pathappend /usr/share/info INFOPATH diff --git a/utils/etc/profile.d/i18n.sh b/utils/etc/profile.d/i18n.sh deleted file mode 100644 index 655ffa7..0000000 --- a/utils/etc/profile.d/i18n.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Set up i18n variables -. /etc/locale.conf -export LANG diff --git a/utils/etc/profile.d/readline.sh b/utils/etc/profile.d/readline.sh deleted file mode 100644 index d4af1c8..0000000 --- a/utils/etc/profile.d/readline.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Setup the INPUTRC environment variable. -if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then - INPUTRC=/etc/inputrc -fi -export INPUTRC diff --git a/utils/etc/profile.d/umask.sh b/utils/etc/profile.d/umask.sh deleted file mode 100644 index 191d324..0000000 --- a/utils/etc/profile.d/umask.sh +++ /dev/null @@ -1,6 +0,0 @@ -# By default, the umask should be set. -if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then - umask 002 -else - umask 022 -fi diff --git a/utils/etc/skel/.bash_logout b/utils/etc/skel/.bash_logout index 4c470b0..821d8a5 100644 --- a/utils/etc/skel/.bash_logout +++ b/utils/etc/skel/.bash_logout @@ -1 +1,4 @@ -# Personal items to perform on logout. +# Anything to perform on logout. Not normally used, but here just in case. + +# Uncomment to clear the screen (will be done automatically on TTYs). +#clear diff --git a/utils/etc/skel/.bash_profile b/utils/etc/skel/.bash_profile index 38d8bb5..09850bb 100644 --- a/utils/etc/skel/.bash_profile +++ b/utils/etc/skel/.bash_profile @@ -1,17 +1,4 @@ -# Personal environment variables and startup programs. - -# Personal aliases and functions should go in ~/.bashrc. System wide -# environment variables and startup programs are in /etc/profile. -# System wide aliases and functions are in /etc/bashrc. - -if [ -f "$HOME/.bashrc" ] ; then - source $HOME/.bashrc -fi - -if [ -d "$HOME/bin" ] ; then - pathprepend $HOME/bin -fi - -if [ -d "$HOME/.local/bin" ] ; then - pathprepend $HOME/.local/bin +# Just load bashrc, it has what we need. +if [ -f $HOME/.bashrc ]; then + . $HOME/.bashrc fi diff --git a/utils/etc/skel/.bashrc b/utils/etc/skel/.bashrc index 809672c..7db09c0 100644 --- a/utils/etc/skel/.bashrc +++ b/utils/etc/skel/.bashrc @@ -1,13 +1,11 @@ -# Personal aliases and functions. - -# Personal environment variables and startup programs should go in -# ~/.bash_profile. System wide environment variables and startup -# programs are in /etc/profile. System wide aliases and functions are -# in /etc/bashrc. - -if [ -f "/etc/bashrc" ] ; then - source /etc/bashrc +# Just load the system bashrc, it has what we need. +if [ -f "/etc/bashrc" ]; then + . /etc/bashrc fi -# Set up user specific i18n variables +# Add local bin directories to PATH. +export PATH=$HOME/bin:$HOME/.local/bin:$PATH + +# If needed, uncomment to set a personal language and console keymap. #export LANG=en_US.UTF-8 +#export KEYMAP=us diff --git a/utils/etc/skel/.profile b/utils/etc/skel/.profile index 0d878fb..09850bb 100644 --- a/utils/etc/skel/.profile +++ b/utils/etc/skel/.profile @@ -1,12 +1,4 @@ -# Personal environment variables and startup programs. - -if [ -d "$HOME/bin" ] ; then - pathprepend $HOME/bin +# Just load bashrc, it has what we need. +if [ -f $HOME/.bashrc ]; then + . $HOME/.bashrc fi - -if [ -d "$HOME/.local/bin" ] ; then - pathprepend $HOME/.local/bin -fi - -# Set up user specific i18n variables -#export LANG=en_US.UTF-8 From cb8e77f2681cd544097a8103c9887ad8aa067e19 Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Fri, 1 Jul 2022 16:15:47 +0100 Subject: [PATCH 30/32] Add zap (AppImage package manager) --- build-system.sh | 10 ++++++++++ changelog.md | 2 ++ source-urls | 2 ++ utils/builtins | 1 + 4 files changed, 15 insertions(+) diff --git a/build-system.sh b/build-system.sh index 0b8cf8f..fb64c5d 100755 --- a/build-system.sh +++ b/build-system.sh @@ -6485,6 +6485,16 @@ glib-compile-schemas /usr/share/glib-2.0/schemas install -t /usr/share/licenses/gvfs -Dm644 ../COPYING cd ../.. rm -rf gvfs-1.50.2 +# zap (AppImage package manager). +tar -xf zap-2.2.1.tar.gz +cd zap-2.2.1 +tar -xf ../go1.18.3.linux-amd64.tar.gz +GOPATH="$PWD/go" ./go/bin/go build -trimpath -ldflags "-s -w -X main.BuildVersion=2.2.1-MassOS -X main.BuildTime=$(date '+%Y-%m-%dT%H:%M:%S')" +install -t /usr/bin -Dm755 zap +help2man -N zap > /usr/share/man/man1/zap.1 +install -t /usr/share/licenses/zap -Dm644 LICENSE +cd .. +rm -rf zap-2.2.1 # Arc Theme for Xfce. tar --no-same-owner -xf arc-theme-20220102.tar.xz -C /usr/share --strip-components=1 gtk-update-icon-cache /usr/share/icons/Arc diff --git a/changelog.md b/changelog.md index 9d668c9..223d0e4 100644 --- a/changelog.md +++ b/changelog.md @@ -6,9 +6,11 @@ Changes: - Fixed very long startup times in Firefox and Evince (https://github.com/MassOS-Linux/MassOS/issues/29). - Fixed an issue setting the default locale in the MassOS Installer (https://github.com/MassOS-Linux/MassOS/issues/35). +- Added zap, a lightweight package manager for AppImages. - Added mouse/cursor support for non-graphical environments (e.g. tty terminals). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. - Replaced dhclient with dhcpcd, as dhclient is now deprecated upstream. +- Reworked the shell startup files (profile, bashrc, etc.) to hopefully fix some issues. Upgraded software: diff --git a/source-urls b/source-urls index 5addbb7..44c8cd4 100644 --- a/source-urls +++ b/source-urls @@ -155,6 +155,7 @@ https://archive.massos.org/sources/gnu-efi-3.0.14.tar.bz2 https://archive.massos.org/sources/gnu-gs-fonts-other-6.0.tar.gz https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.6.tar.bz2 https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.6.tar.xz +https://dl.google.com/go/go1.18.3.linux-amd64.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz https://gitlab.gnome.org/GNOME/gparted/-/archive/GPARTED_1_4_0/gparted-GPARTED_1_4_0.tar.bz2 https://mirror.lyrahosting.com/gnu/gperf/gperf-3.1.tar.gz @@ -685,6 +686,7 @@ https://www.x.org/archive/individual/app/xwud-1.0.5.tar.bz2 https://github.com/Cyan4973/xxHash/archive/v0.8.1/xxHash-0.8.1.tar.gz https://archive.massos.org/sources/xz-5.2.5.tar.xz https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz +https://github.com/srevinsaju/zap/archive/v2.2.1/zap-2.2.1.tar.gz https://archive.massos.org/sources/zip30.tar.gz https://files.pythonhosted.org/packages/52/c5/df7953fe6065185af5956265e3b16f13c2826c2b1ba23d43154f3af453bc/zipp-3.7.0-py3-none-any.whl https://zlib.net/zlib-1.2.12.tar.xz diff --git a/utils/builtins b/utils/builtins index 356a482..10d09f5 100644 --- a/utils/builtins +++ b/utils/builtins @@ -658,6 +658,7 @@ xwininfo xwud xxhash xz +zap zip zipp zlib From 809342028c423ba360caa236b10d9d5d0047878c Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Fri, 1 Jul 2022 20:19:07 +0100 Subject: [PATCH 31/32] Replace Thunderbird with Claws Mail Thunderbird takes up about 230MB of space, some users have complained about it being "bloatware". Claws Mail is only about 5MB and it is more integrated with Xfce. Flatpak is and will be the recommended way to get Thunderbird since it allows it to be updated outside of MassOS. We can also compile Claws without needing to use precompiled binaries. --- build-system.sh | 50 +-- changelog.md | 5 +- patches/claws-mail-4.1.0-perl5.36.patch | 454 ++++++++++++++++++++++ patches/libetpan-1.9.4-securityfix.patch | 80 ++++ patches/pipewire-0.3.52-upstreamfix.patch | 36 -- source-urls | 3 +- utils/builtins | 3 +- 7 files changed, 561 insertions(+), 70 deletions(-) create mode 100644 patches/claws-mail-4.1.0-perl5.36.patch create mode 100644 patches/libetpan-1.9.4-securityfix.patch delete mode 100644 patches/pipewire-0.3.52-upstreamfix.patch diff --git a/build-system.sh b/build-system.sh index fb64c5d..73ad522 100755 --- a/build-system.sh +++ b/build-system.sh @@ -6918,6 +6918,26 @@ glib-compile-schemas /usr/share/glib-2.0/schemas install -t /usr/share/licenses/mugshot -Dm644 COPYING cd .. rm -rf mugshot-0.4.3 +# libetpan (for Claws Mail). +tar -xf libetpan-1.9.4.tar.gz +cd libetpan-1.9.4 +patch -Np1 -i ../patches/libetpan-1.9.4-securityfix.patch +./autogen.sh --prefix=/usr --disable-debug --disable-static --with-gnutls --without-openssl +make +make install +install -t /usr/share/licenses/libetpan -Dm644 COPYRIGHT +cd .. +rm -rf libetpan-1.9.4 +# Claws Mail. +tar -xf claws-mail-4.1.0.tar.xz +cd claws-mail-4.1.0 +patch -Np1 -i ../patches/claws-mail-4.1.0-perl5.36.patch +./configure --prefix=/usr --disable-static --enable-bogofilter-plugin --enable-crash-dialog --enable-enchant --enable-fancy-plugin --enable-gnutls --enable-ldap --enable-manual --enable-pgpmime-plugin --enable-spamassassin-plugin +make +make install +install -t /usr/share/licenses/claws-mail -Dm644 COPYING +cd .. +rm -rf claws-mail-4.1.0 # Evince. tar -xf evince-42.3.tar.xz cd evince-42.3 @@ -7057,36 +7077,6 @@ install -dm755 /usr/share/licenses/firefox cat > /usr/share/licenses/firefox/LICENSE << "END" Please type 'about:license' in the Firefox URL box to view the Firefox license. END -# Thunderbird. -tar --no-same-owner -xf thunderbird-102.0.tar.bz2 -C /usr/lib -mkdir -p /usr/lib/thunderbird/distribution -cat > /usr/lib/thunderbird/distribution/policies.json << END -{ - "policies": { - "DisableAppUpdate": true - } -} -END -ln -sr /usr/lib/thunderbird/thunderbird /usr/bin/thunderbird -cat > /usr/share/applications/thunderbird.desktop << END -[Desktop Entry] -Name=Thunderbird Mail -Comment=Send and receive mail with Thunderbird -GenericName=Mail Client -Exec=thunderbird %u -Terminal=false -Type=Application -Icon=thunderbird -Categories=Network;Email; -MimeType=application/xhtml+xml;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto; -StartupNotify=true -END -ln -sr /usr/lib/thunderbird/chrome/icons/default/default256.png /usr/share/pixmaps/thunderbird.png -install -dm755 /usr/share/licenses/thunderbird -cat > /usr/share/licenses/thunderbird/LICENSE << "END" -To view the license for Thunderbird, please open Thunderbird, go to the menu, -choose "About Thunderbird", and click "Licensing Information". -END # Busybox. tar -xf busybox-1.35.0.tar.bz2 cd busybox-1.35.0 diff --git a/changelog.md b/changelog.md index 223d0e4..293fee0 100644 --- a/changelog.md +++ b/changelog.md @@ -10,7 +10,9 @@ Changes: - Added mouse/cursor support for non-graphical environments (e.g. tty terminals). - Added Vulkan-Tools, small utilities for working with and testing GPU Vulkan support. - Replaced dhclient with dhcpcd, as dhclient is now deprecated upstream. -- Reworked the shell startup files (profile, bashrc, etc.) to hopefully fix some issues. +- Reworked the shell startup files (profile, bashrc, etc.) to hopefully fix some environment-related issues. +- Replaced Thunderbird with a more lightweight alternative (saves about 230MB). + - If desired, Thunderbird can still be installed from the software centre / Flatpak, and this is the preferred way to get it since it allows it to be updated independently of MassOS. Upgraded software: @@ -74,7 +76,6 @@ Upgraded software: - squashfuse: `0.1.104 --> 0.1.105` - Sudo: `1.9.10 --> 1.9.11p3` - systemd: `251.1 --> 251.2` -- Thunderbird: `91.9.1 --> 102.0` - UPower: `0.99.18 --> 0.99.19` - Vim: `8.2.5046 --> 9.0.0000` - Vulkan-Headers: `1.3.213 --> 1.3.217` diff --git a/patches/claws-mail-4.1.0-perl5.36.patch b/patches/claws-mail-4.1.0-perl5.36.patch new file mode 100644 index 0000000..f92114a --- /dev/null +++ b/patches/claws-mail-4.1.0-perl5.36.patch @@ -0,0 +1,454 @@ +Description: the perl fix¹ for bug #1009149 disallows the use + of XSRETURN_* macros in expressions, hence all of them have to + be rewritten. Thanks to Andreas Rönnquist for the heads up! + ¹ https://salsa.debian.org/perl-team/interpreter/perl/-/commit/c949a3d4176ec66493af1aa87c1dc64fc6127bb6 +Author: Ricardo Mones +Last-Updated: 2022-04-12 + +diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c +index 1ac005e1..ee9e15f2 100644 +--- a/src/plugins/perl/perl_plugin.c ++++ b/src/plugins/perl/perl_plugin.c +@@ -577,76 +577,182 @@ static XS(XS_ClawsMail_filter_init) + + /* msginfo */ + case 1: +- msginfo->size ? XSRETURN_UV(msginfo->size) : XSRETURN_UNDEF; ++ if (msginfo->size) { ++ XSRETURN_UV(msginfo->size); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 2: +- msginfo->date ? XSRETURN_PV(msginfo->date) : XSRETURN_UNDEF; ++ if (msginfo->date) { ++ XSRETURN_PV(msginfo->date); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 3: +- msginfo->from ? XSRETURN_PV(msginfo->from) : XSRETURN_UNDEF; ++ if (msginfo->from) { ++ XSRETURN_PV(msginfo->from); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 4: +- msginfo->to ? XSRETURN_PV(msginfo->to) : XSRETURN_UNDEF; ++ if (msginfo->to) { ++ XSRETURN_PV(msginfo->to); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 5: +- msginfo->cc ? XSRETURN_PV(msginfo->cc) : XSRETURN_UNDEF; ++ if (msginfo->cc) { ++ XSRETURN_PV(msginfo->cc); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 6: +- msginfo->newsgroups ? XSRETURN_PV(msginfo->newsgroups) : XSRETURN_UNDEF; ++ if (msginfo->newsgroups) { ++ XSRETURN_PV(msginfo->newsgroups); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 7: +- msginfo->subject ? XSRETURN_PV(msginfo->subject) : XSRETURN_UNDEF; ++ if (msginfo->subject) { ++ XSRETURN_PV(msginfo->subject); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 8: +- msginfo->msgid ? XSRETURN_PV(msginfo->msgid) : XSRETURN_UNDEF; ++ if (msginfo->msgid) { ++ XSRETURN_PV(msginfo->msgid); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 9: +- msginfo->inreplyto ? XSRETURN_PV(msginfo->inreplyto) : XSRETURN_UNDEF; ++ if (msginfo->inreplyto) { ++ XSRETURN_PV(msginfo->inreplyto); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 10: +- msginfo->xref ? XSRETURN_PV(msginfo->xref) : XSRETURN_UNDEF; ++ if (msginfo->xref) { ++ XSRETURN_PV(msginfo->xref); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 11: + xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE); +- xface ? XSRETURN_PV(xface) : XSRETURN_UNDEF; ++ if (xface) { ++ XSRETURN_PV(xface); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 12: +- (msginfo->extradata && msginfo->extradata->dispositionnotificationto) ? +- XSRETURN_PV(msginfo->extradata->dispositionnotificationto) : XSRETURN_UNDEF; ++ if (msginfo->extradata && msginfo->extradata->dispositionnotificationto) { ++ XSRETURN_PV(msginfo->extradata->dispositionnotificationto); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 13: +- (msginfo->extradata && msginfo->extradata->returnreceiptto) ? +- XSRETURN_PV(msginfo->extradata->returnreceiptto) : XSRETURN_UNDEF; ++ if (msginfo->extradata && msginfo->extradata->returnreceiptto) { ++ XSRETURN_PV(msginfo->extradata->returnreceiptto); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 14: + EXTEND(SP, g_slist_length(msginfo->references)); + ii = 0; + for(walk = msginfo->references; walk != NULL; walk = g_slist_next(walk)) + XST_mPV(ii++,walk->data ? (gchar*) walk->data: ""); +- ii ? XSRETURN(ii) : XSRETURN_UNDEF; ++ if (ii) { ++ XSRETURN(ii); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 15: +- msginfo->score ? XSRETURN_IV(msginfo->score) : XSRETURN_UNDEF; ++ if (msginfo->score) { ++ XSRETURN_IV(msginfo->score); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 17: +- msginfo->plaintext_file ? +- XSRETURN_PV(msginfo->plaintext_file) : XSRETURN_UNDEF; ++ if (msginfo->plaintext_file) { ++ XSRETURN_PV(msginfo->plaintext_file); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 19: +- msginfo->hidden ? XSRETURN_IV(msginfo->hidden) : XSRETURN_UNDEF; ++ if (msginfo->hidden) { ++ XSRETURN_IV(msginfo->hidden); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 20: + if((charp = procmsg_get_message_file_path(msginfo)) != NULL) { + strncpy2(buf,charp,sizeof(buf)); + g_free(charp); + XSRETURN_PV(buf); + } +- else ++ else { + XSRETURN_UNDEF; ++ } + case 21: +- (msginfo->extradata && msginfo->extradata->partial_recv) ? +- XSRETURN_PV(msginfo->extradata->partial_recv) : XSRETURN_UNDEF; ++ if (msginfo->extradata && msginfo->extradata->partial_recv) { ++ XSRETURN_PV(msginfo->extradata->partial_recv); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 22: +- msginfo->total_size ? XSRETURN_IV(msginfo->total_size) : XSRETURN_UNDEF; ++ if (msginfo->total_size) { ++ XSRETURN_IV(msginfo->total_size); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 23: +- (msginfo->extradata && msginfo->extradata->account_server) ? +- XSRETURN_PV(msginfo->extradata->account_server) : XSRETURN_UNDEF; ++ if (msginfo->extradata && msginfo->extradata->account_server) { ++ XSRETURN_PV(msginfo->extradata->account_server); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 24: +- (msginfo->extradata && msginfo->extradata->account_login) ? +- XSRETURN_PV(msginfo->extradata->account_login) : XSRETURN_UNDEF; ++ if (msginfo->extradata && msginfo->extradata->account_login) { ++ XSRETURN_PV(msginfo->extradata->account_login); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + case 25: +- msginfo->planned_download ? +- XSRETURN_IV(msginfo->planned_download) : XSRETURN_UNDEF; ++ if (msginfo->planned_download) { ++ XSRETURN_IV(msginfo->planned_download); ++ } ++ else { ++ XSRETURN_UNDEF; ++ } + + /* general */ + case 100: +- if(manual_filtering) ++ if(manual_filtering) { + XSRETURN_YES; +- else ++ } ++ else { + XSRETURN_NO; ++ } + default: + g_warning("Perl plugin: wrong argument to ClawsMail::C::init"); + XSRETURN_UNDEF; +@@ -664,8 +770,9 @@ static XS(XS_ClawsMail_open_mail_file) + XSRETURN_UNDEF; + } + file = procmsg_get_message_file_path(msginfo); +- if(!file) ++ if(!file) { + XSRETURN_UNDEF; ++ } + if((message_file = claws_fopen(file, "rb")) == NULL) { + FILE_OP_ERROR(file, "claws_fopen"); + g_warning("Perl plugin: file open error in ClawsMail::C::open_mail_file"); +@@ -718,8 +825,9 @@ static XS(XS_ClawsMail_get_next_header) + g_free(buf); + XSRETURN(2); + } +- else ++ else { + XSRETURN_EMPTY; ++ } + } + + /* ClawsMail::C::get_next_body_line */ +@@ -736,10 +844,12 @@ static XS(XS_ClawsMail_get_next_body_line) + g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first"); + XSRETURN_UNDEF; + } +- if(claws_fgets(buf, sizeof(buf), message_file) != NULL) ++ if(claws_fgets(buf, sizeof(buf), message_file) != NULL) { + XSRETURN_PV(buf); +- else ++ } ++ else { + XSRETURN_UNDEF; ++ } + } + + +@@ -772,57 +882,65 @@ static XS(XS_ClawsMail_check_flag) + filter_log_write(LOG_MATCH,"marked"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 2: + if(MSG_IS_UNREAD(msginfo->flags)) { + filter_log_write(LOG_MATCH,"unread"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 3: + if(MSG_IS_DELETED(msginfo->flags)) { + filter_log_write(LOG_MATCH,"deleted"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 4: + if(MSG_IS_NEW(msginfo->flags)) { + filter_log_write(LOG_MATCH,"new"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 5: + if(MSG_IS_REPLIED(msginfo->flags)) { + filter_log_write(LOG_MATCH,"replied"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 6: + if(MSG_IS_FORWARDED(msginfo->flags)) { + filter_log_write(LOG_MATCH,"forwarded"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 7: + if(MSG_IS_LOCKED(msginfo->flags)) { + filter_log_write(LOG_MATCH,"locked"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + case 8: + if(MSG_IS_IGNORE_THREAD(msginfo->flags)) { + filter_log_write(LOG_MATCH,"ignore_thread"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + default: + g_warning("Perl plugin: unknown argument to ClawsMail::C::check_flag"); + XSRETURN_UNDEF; +@@ -845,8 +963,9 @@ static XS(XS_ClawsMail_colorlabel) + filter_log_write(LOG_MATCH,"colorlabel"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + } + + /* ClawsMail::C::age_greater(int) */ +@@ -866,8 +985,9 @@ static XS(XS_ClawsMail_age_greater) + filter_log_write(LOG_MATCH,"age_greater"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + } + + /* ClawsMail::C::age_lower(int) */ +@@ -887,8 +1007,9 @@ static XS(XS_ClawsMail_age_lower) + filter_log_write(LOG_MATCH,"age_lower"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + } + + /* ClawsMail::C::tagged() */ +@@ -900,7 +1021,12 @@ static XS(XS_ClawsMail_tagged) + XSRETURN_UNDEF; + } + +- return msginfo->tags ? XSRETURN_YES : XSRETURN_NO; ++ if (msginfo->tags) { ++ XSRETURN_YES; ++ } ++ else { ++ XSRETURN_NO; ++ } + } + + /* ClawsMail::C::get_tags() */ +@@ -1032,10 +1158,12 @@ static XS(XS_ClawsMail_make_sure_folder_exists) + + identifier = SvPV_nolen(ST(0)); + item = folder_get_item_from_identifier(identifier); +- if(item) ++ if(item) { + XSRETURN_YES; +- else ++ } ++ else { + XSRETURN_NO; ++ } + } + + +@@ -1066,8 +1194,9 @@ static XS(XS_ClawsMail_addr_in_addressbook) + filter_log_write(LOG_MATCH,"addr_in_addressbook"); + XSRETURN_YES; + } +- else ++ else { + XSRETURN_NO; ++ } + } + + +@@ -1348,8 +1477,9 @@ static XS(XS_ClawsMail_forward) + + XSRETURN_YES; + } +- else ++ else { + XSRETURN_UNDEF; ++ } + } + + /* ClawsMail::C::redirect(int,char*) */ +@@ -1373,8 +1503,9 @@ static XS(XS_ClawsMail_redirect) + account = account_find_from_id(account_id); + compose = compose_redirect(account, msginfo, TRUE); + +- if (compose->account->protocol == A_NNTP) ++ if (compose->account->protocol == A_NNTP) { + XSRETURN_UNDEF; ++ } + else + compose_entry_append(compose, dest, COMPOSE_TO, PREF_NONE); + +@@ -1389,8 +1520,9 @@ static XS(XS_ClawsMail_redirect) + + XSRETURN_YES; + } +- else ++ else { + XSRETURN_UNDEF; ++ } + } + + +@@ -1472,8 +1604,9 @@ static XS(XS_ClawsMail_get_attribute_value) + attribute_value = get_attribute_value(addr,attr,bookname); + } + +- if(attribute_value) ++ if(attribute_value) { + XSRETURN_PV(attribute_value); ++ } + XSRETURN_PV(""); + } + diff --git a/patches/libetpan-1.9.4-securityfix.patch b/patches/libetpan-1.9.4-securityfix.patch new file mode 100644 index 0000000..6ee335c --- /dev/null +++ b/patches/libetpan-1.9.4-securityfix.patch @@ -0,0 +1,80 @@ +From 1002a0121a8f5a9aee25357769807f2c519fa50b Mon Sep 17 00:00:00 2001 +From: Damian Poddebniak +Date: Fri, 24 Jul 2020 19:39:53 +0200 +Subject: [PATCH] Detect extra data after STARTTLS response and exit (#387) + +--- + src/low-level/imap/mailimap.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/low-level/imap/mailimap.c b/src/low-level/imap/mailimap.c +index bb17119d..4ffcf55d 100644 +--- a/src/low-level/imap/mailimap.c ++++ b/src/low-level/imap/mailimap.c +@@ -2428,6 +2428,13 @@ int mailimap_starttls(mailimap * session) + + mailimap_response_free(response); + ++ // Detect if the server send extra data after the STARTTLS response. ++ // This *may* be a "response injection attack". ++ if (session->imap_stream->read_buffer_len != 0) { ++ // Since it is also an IMAP protocol violation, exit. ++ return MAILIMAP_ERROR_STARTTLS; ++ } ++ + switch (error_code) { + case MAILIMAP_RESP_COND_STATE_OK: + return MAILIMAP_NO_ERROR; + +From 298460a2adaabd2f28f417a0f106cb3b68d27df9 Mon Sep 17 00:00:00 2001 +From: Fabian Ising +Date: Fri, 24 Jul 2020 19:40:48 +0200 +Subject: [PATCH] Detect extra data after STARTTLS responses in SMTP and POP3 + and exit (#388) + +* Detect extra data after STLS response and return error + +* Detect extra data after SMTP STARTTLS response and return error +--- + src/low-level/pop3/mailpop3.c | 8 ++++++++ + src/low-level/smtp/mailsmtp.c | 8 ++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/low-level/pop3/mailpop3.c b/src/low-level/pop3/mailpop3.c +index ab9535be..e2124bf8 100644 +--- a/src/low-level/pop3/mailpop3.c ++++ b/src/low-level/pop3/mailpop3.c +@@ -959,6 +959,14 @@ int mailpop3_stls(mailpop3 * f) + + if (r != RESPONSE_OK) + return MAILPOP3_ERROR_STLS_NOT_SUPPORTED; ++ ++ // Detect if the server send extra data after the STLS response. ++ // This *may* be a "response injection attack". ++ if (f->pop3_stream->read_buffer_len != 0) { ++ // Since it is also protocol violation, exit. ++ // There is no error type for STARTTLS errors in POP3 ++ return MAILPOP3_ERROR_SSL; ++ } + + return MAILPOP3_NO_ERROR; + } +diff --git a/src/low-level/smtp/mailsmtp.c b/src/low-level/smtp/mailsmtp.c +index b7fc459e..3145cadf 100644 +--- a/src/low-level/smtp/mailsmtp.c ++++ b/src/low-level/smtp/mailsmtp.c +@@ -1111,6 +1111,14 @@ int mailesmtp_starttls(mailsmtp * session) + return MAILSMTP_ERROR_STREAM; + r = read_response(session); + ++ // Detect if the server send extra data after the STARTTLS response. ++ // This *may* be a "response injection attack". ++ if (session->stream->read_buffer_len != 0) { ++ // Since it is also protocol violation, exit. ++ // There is no general error type for STARTTLS errors in SMTP ++ return MAILSMTP_ERROR_SSL; ++ } ++ + switch (r) { + case 220: + return MAILSMTP_NO_ERROR; diff --git a/patches/pipewire-0.3.52-upstreamfix.patch b/patches/pipewire-0.3.52-upstreamfix.patch deleted file mode 100644 index 988c2db..0000000 --- a/patches/pipewire-0.3.52-upstreamfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 68bafcf166d98539dfda949f40c7438c1e4b2ec6 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Tue, 14 Jun 2022 11:18:52 +0200 -Subject: [PATCH] pulse-server: Don't send more than fragsize chunks - -Send exactly fragsize chunks when capturing. - -See #2418 and #2434 ---- - src/modules/module-protocol-pulse/pulse-server.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c -index f5e931969..85939229f 100644 ---- a/src/modules/module-protocol-pulse/pulse-server.c -+++ b/src/modules/module-protocol-pulse/pulse-server.c -@@ -87,9 +87,6 @@ - #define DEFAULT_POSITION "[ FL FR ]" - - #define MAX_FORMATS 32 --/* The max amount of data we send in one block when capturing. In PulseAudio this -- * size is derived from the mempool PA_MEMPOOL_SLOT_SIZE */ --#define MAX_FRAGSIZE (64*1024) - - #define TEMPORARY_MOVE_TIMEOUT (SPA_NSEC_PER_SEC) - -@@ -1326,8 +1323,7 @@ do_process_done(struct spa_loop *loop, - } - - while ((uint32_t)avail >= stream->attr.fragsize) { -- towrite = SPA_MIN(avail, MAX_FRAGSIZE); -- towrite = SPA_ROUND_DOWN(towrite, stream->frame_size); -+ towrite = SPA_MIN((uint32_t)avail, stream->attr.fragsize); - - msg = message_alloc(impl, stream->channel, towrite); - if (msg == NULL) diff --git a/source-urls b/source-urls index 44c8cd4..9cb9462 100644 --- a/source-urls +++ b/source-urls @@ -48,6 +48,7 @@ https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz https://files.pythonhosted.org/packages/source/c/chardet/chardet-4.0.0.tar.gz https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang-14.0.6.src.tar.xz +https://www.claws-mail.org/releases/claws-mail-4.1.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter/1.26/clutter-1.26.4.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2.tar.gz @@ -245,6 +246,7 @@ https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz https://videolan.mirrors.nublue.co.uk/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2 https://videolan.mirrors.nublue.co.uk/libdvdread/6.1.3/libdvdread-6.1.3.tar.bz2 https://github.com/anholt/libepoxy/archive/1.5.10/libepoxy-1.5.10.tar.gz +https://github.com/dinhvh/libetpan/archive/1.9.4/libetpan-1.9.4.tar.gz https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz https://github.com/libexif/libexif/releases/download/v0.6.23/libexif-0.6.23.tar.xz @@ -558,7 +560,6 @@ https://archive.massos.org/sources/thin-provisioning-tools-0.9.0.tar.gz https://mirror.netcologne.de/xfce/src/xfce/thunar/4.17/thunar-4.17.8.tar.bz2 https://mirror.netcologne.de/xfce/src/thunar-plugins/thunar-archive-plugin/0.5/thunar-archive-plugin-0.5.0.tar.bz2 https://mirror.netcologne.de/xfce/src/xfce/thunar-volman/4.16/thunar-volman-4.16.0.tar.bz2 -https://archive.mozilla.org/pub/thunderbird/releases/102.0/linux-x86_64/en-US/thunderbird-102.0.tar.bz2 https://archive.massos.org/sources/tk8.6.12-src.tar.gz https://files.pythonhosted.org/packages/source/t/toml/toml-0.10.2.tar.gz https://github.com/tpm2-software/tpm2-tss/releases/download/3.2.0/tpm2-tss-3.2.0.tar.gz diff --git a/utils/builtins b/utils/builtins index 10d09f5..9e9082e 100644 --- a/utils/builtins +++ b/utils/builtins @@ -45,6 +45,7 @@ cffi chardet check clang +claws-mail clutter clutter-gtk cmake @@ -232,6 +233,7 @@ libdrm libdvdnav libdvdread libepoxy +libetpan libevdev libevent libexif @@ -535,7 +537,6 @@ thin-provisioning-tools thunar thunar-archive-plugin thunar-volman -thunderbird tk tldr toml From 7b85c6b8444c95bf503ade3b4d413d8925bf16ef Mon Sep 17 00:00:00 2001 From: The Sonic Master Date: Sat, 2 Jul 2022 12:21:13 +0100 Subject: [PATCH 32/32] MassOS 2022.07 release --- build-system.sh | 33 +++++----- changelog.md | 8 ++- patches/pipewire-0.3.53-upstreamfix.patch | 77 +++++++++++++++++++++++ source-urls | 10 +-- utils/etc/lsb-release | 4 +- utils/etc/os-release | 10 +-- utils/massos-release | 2 +- 7 files changed, 113 insertions(+), 31 deletions(-) create mode 100644 patches/pipewire-0.3.53-upstreamfix.patch diff --git a/build-system.sh b/build-system.sh index 73ad522..2e7623a 100755 --- a/build-system.sh +++ b/build-system.sh @@ -859,8 +859,8 @@ install -t /usr/share/licenses/mpdecimal -Dm644 LICENSE.txt cd .. rm -rf mpdecimal-2.5.1 # kmod. -tar -xf kmod-29.tar.xz -cd kmod-29 +tar -xf kmod-30.tar.xz +cd kmod-30 ./configure --prefix=/usr --sysconfdir=/etc --with-xz --with-zstd --with-zlib --with-openssl make make install @@ -868,7 +868,7 @@ for target in depmod insmod modinfo modprobe rmmod; do ln -sf ../bin/kmod /usr/s ln -sf kmod /usr/bin/lsmod install -t /usr/share/licenses/kmod -Dm644 COPYING cd .. -rm -rf kmod-29 +rm -rf kmod-30 # Python (initial build; will be rebuilt later to support SQLite and Tk). tar -xf Python-3.10.5.tar.xz cd Python-3.10.5 @@ -2924,16 +2924,16 @@ make -C dkms-3.0.3 BASHDIR=/usr/share/bash-completion/completions install install -t /usr/share/licenses/dkms -Dm644 dkms-3.0.3/COPYING rm -rf dkms-3.0.3 # GLib. -tar -xf glib-2.72.2.tar.xz -cd glib-2.72.2 +tar -xf glib-2.72.3.tar.xz +cd glib-2.72.3 patch -Np1 -i ../patches/glib-2.72.0-lessnoisy.patch mkdir glib-build; cd glib-build -meson --prefix=/usr --buildtype=minsize -Dman=true .. +meson --prefix=/usr --buildtype=minsize -Dman=true -Dtests=false .. ninja ninja install install -t /usr/share/licenses/glib -Dm644 ../COPYING cd ../.. -rm -rf glib-2.72.2 +rm -rf glib-2.72.3 # GTK-Doc. tar -xf gtk-doc-1.33.2.tar.xz cd gtk-doc-1.33.2 @@ -3959,15 +3959,15 @@ install -t /usr/share/licenses/libglvnd -Dm644 ../COPYING cd ../.. rm -rf libglvnd-v1.4.0 # Mesa. -tar -xf mesa-22.1.2.tar.xz -cd mesa-22.1.2 +tar -xf mesa-22.1.3.tar.xz +cd mesa-22.1.3 mkdir mesa-build; cd mesa-build meson --prefix=/usr --buildtype=minsize -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled .. ninja ninja install install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst cd ../.. -rm -rf mesa-22.1.2 +rm -rf mesa-22.1.3 # libva (rebuild to support Mesa). tar -xf libva-2.15.0.tar.gz cd libva-2.15.0 @@ -5853,15 +5853,15 @@ install -t /usr/share/licenses/gsettings-desktop-schemas -Dm644 ../COPYING cd ../.. rm -rf gsettings-desktop-schemas-42.0 # glib-networking. -tar -xf glib-networking-2.72.0.tar.xz -cd glib-networking-2.72.0 +tar -xf glib-networking-2.72.1.tar.xz +cd glib-networking-2.72.1 mkdir glibnet-build; cd glibnet-build meson --prefix=/usr --buildtype=minsize .. ninja ninja install install -t /usr/share/licenses/glib-networking -Dm644 ../COPYING cd ../.. -rm -rf glib-networking-2.72.0 +rm -rf glib-networking-2.72.1 # libsoup. tar -xf libsoup-2.74.2.tar.xz cd libsoup-2.74.2 @@ -5873,15 +5873,15 @@ install -t /usr/share/licenses/libsoup -Dm644 ../COPYING cd ../.. rm -rf libsoup-2.74.2 # libsoup3. -tar -xf libsoup-3.0.6.tar.xz -cd libsoup-3.0.6 +tar -xf libsoup-3.0.7.tar.xz +cd libsoup-3.0.7 mkdir soup3-build; cd soup3-build meson --prefix=/usr --buildtype=minsize -Dpkcs11_tests=disabled -Dtests=false .. ninja ninja install install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING cd ../.. -rm -rf libsoup-3.0.6 +rm -rf libsoup-3.0.7 # libostree. tar -xf libostree-2022.4.tar.xz cd libostree-2022.4 @@ -6369,6 +6369,7 @@ rm -rf gstreamer-vaapi-1.20.3 # PipeWire + WirePlumber. tar -xf pipewire-0.3.53.tar.gz cd pipewire-0.3.53 +patch -Np1 -i ../patches/pipewire-0.3.53-upstreamfix.patch mkdir -p subprojects/wireplumber tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1 mkdir pipewire-build; cd pipewire-build diff --git a/changelog.md b/changelog.md index 293fee0..33b1b20 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ # Full Changelog History This document contains the full changelog for every previous versions of MassOS, as well as the changes currently in development for the next upcoming version of MassOS (which may be subject to change before the version is finally released). -# Current Development +# MassOS 2022.07 Changes: - Fixed very long startup times in Firefox and Evince (https://github.com/MassOS-Linux/MassOS/issues/29). @@ -26,6 +26,8 @@ Upgraded software: - File: `5.41 --> 5.42` - Firefox: `101.0 --> 102.0` - Git: `2.36.1 --> 2.37.0` +- GLib: `2.72.2 --> 2.72.3` +- glib-networking: `2.72.0 --> 2.72.1` - glslang: `11.9.0 --> 11.10.0` - Graphviz: `3.0.0 --> 4.0.0` - HarfBuzz: `4.3.0 --> 4.4.1` @@ -37,6 +39,7 @@ Upgraded software: - JS91: `91.10.0 --> 91.11.0` - JSON: `4.06 --> 4.07` - kbd: `2.4.0 --> 2.5.1` +- kmod: `29 --> 30` - libdrm: `2.4.110 --> 2.4.111` - libinput: `1.20.1 --> 1.21.0` - libnghttp2: `1.47.0 --> 1.48.0` @@ -44,13 +47,14 @@ Upgraded software: - libostree: `2022.3 --> 2022.4` - libqmi: `1.30.6 --> 1.30.8` - librsvg: `2.54.3 --> 2.54.4` +- libsoup3: `3.0.6 --> 3.0.7` - libva: `2.14.0 --> 2.15.0` - libvpx: `1.11.0 --> 1.12.0` - libX11: `1.8 --> 1.8.1` - Linux Kernel: `5.18.1 --> 5.18.8` - LLVM/Clang/LLD: `14.0.4 --> 14.0.6` - lxml: `4.8.0 --> 4.9.0` -- Mesa: `22.1.0 --> 22.1.2` +- Mesa: `22.1.0 --> 22.1.3` - Meson: `0.62.1 --> 0.62.2` - mpg123: `1.29.3 --> 1.30.0` - mtools: `4.0.39 --> 4.0.40` diff --git a/patches/pipewire-0.3.53-upstreamfix.patch b/patches/pipewire-0.3.53-upstreamfix.patch new file mode 100644 index 0000000..25b8c6c --- /dev/null +++ b/patches/pipewire-0.3.53-upstreamfix.patch @@ -0,0 +1,77 @@ +From 9af94508886b19bb398f4e2a777447ca42907c2f Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 1 Jul 2022 15:25:37 +0200 +Subject: [PATCH] audioconvert: ensure temp buffers are large enough + +Ensure that our temporary buffers can hold at least quantum_limit +samples. When no output or input is connected, we can generate up +to a quantum_limit of silence, which requires all the buffers to +be scaled correctly. + +Fixes a segfault in mpv. +--- + spa/plugins/audioconvert/audioconvert.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c +index ae3e4d7c3..21a7ffea1 100644 +--- a/spa/plugins/audioconvert/audioconvert.c ++++ b/spa/plugins/audioconvert/audioconvert.c +@@ -221,9 +221,7 @@ struct impl { + uint32_t empty_size; + float *empty; + float *scratch; +- float *tmp; +- float *tmp2; +- ++ float *tmp[2]; + float *tmp_datas[2][MAX_PORTS]; + }; + +@@ -1489,9 +1487,9 @@ static int setup_convert(struct impl *this) + return res; + + for (i = 0; i < MAX_PORTS; i++) { +- this->tmp_datas[0][i] = SPA_PTROFF(this->tmp, this->empty_size * i, void); ++ this->tmp_datas[0][i] = SPA_PTROFF(this->tmp[0], this->empty_size * i, void); + this->tmp_datas[0][i] = SPA_PTR_ALIGN(this->tmp_datas[0][i], MAX_ALIGN, void); +- this->tmp_datas[1][i] = SPA_PTROFF(this->tmp2, this->empty_size * i, void); ++ this->tmp_datas[1][i] = SPA_PTROFF(this->tmp[1], this->empty_size * i, void); + this->tmp_datas[1][i] = SPA_PTR_ALIGN(this->tmp_datas[1][i], MAX_ALIGN, void); + } + +@@ -2007,7 +2005,8 @@ impl_node_port_use_buffers(void *object, + + clear_buffers(this, port); + +- maxsize = 0; ++ maxsize = this->quantum_limit * sizeof(float); ++ + for (i = 0; i < n_buffers; i++) { + struct buffer *b; + uint32_t n_datas = buffers[i]->n_datas; +@@ -2048,10 +2047,10 @@ impl_node_port_use_buffers(void *object, + if (maxsize > this->empty_size) { + this->empty = realloc(this->empty, maxsize + MAX_ALIGN); + this->scratch = realloc(this->scratch, maxsize + MAX_ALIGN); +- this->tmp = realloc(this->tmp, (4 * maxsize + MAX_ALIGN) * MAX_PORTS); +- this->tmp2 = realloc(this->tmp2, (4 * maxsize + MAX_ALIGN) * MAX_PORTS); ++ this->tmp[0] = realloc(this->tmp[0], (maxsize + MAX_ALIGN) * MAX_PORTS); ++ this->tmp[1] = realloc(this->tmp[1], (maxsize + MAX_ALIGN) * MAX_PORTS); + if (this->empty == NULL || this->scratch == NULL || +- this->tmp == NULL || this->tmp2 == NULL) ++ this->tmp[0] == NULL || this->tmp[1] == NULL) + return -errno; + memset(this->empty, 0, maxsize + MAX_ALIGN); + this->empty_size = maxsize; +@@ -2639,8 +2638,8 @@ static int impl_clear(struct spa_handle *handle) + free(this->dir[SPA_DIRECTION_OUTPUT].ports[i]); + free(this->empty); + free(this->scratch); +- free(this->tmp); +- free(this->tmp2); ++ free(this->tmp[0]); ++ free(this->tmp[1]); + + if (this->resample.free) + resample_free(&this->resample); diff --git a/source-urls b/source-urls index 9cb9462..e27a523 100644 --- a/source-urls +++ b/source-urls @@ -143,8 +143,8 @@ https://archive.massos.org/sources/ghostscript-fonts-std-8.11.tar.gz https://ftp.acc.umu.se/pub/gnome/sources/gi-docgen/2022/gi-docgen-2022.1.tar.xz https://archive.massos.org/sources/giflib-5.2.1.tar.gz https://cdn.kernel.org/pub/software/scm/git/git-2.37.0.tar.xz -https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.2.tar.xz -https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.3.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.1.tar.xz https://mirror.lyrahosting.com/gnu/glibc/glibc-2.35.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/glibmm/2.66/glibmm-2.66.4.tar.xz https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz @@ -217,7 +217,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz https://github.com/open-source-parsers/jsoncpp/archive/1.9.5/jsoncpp-1.9.5.tar.gz https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.5.1.tar.xz https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz -https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz +https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-30.tar.xz https://kerberos.org/dist/krb5/1.20/krb5-1.20.tar.gz https://github.com/despoa/LAME/archive/refs/tags/lame3_100.tar.gz https://deb.debian.org/debian/pool/main/l/laptop-detect/laptop-detect_0.16.tar.xz @@ -313,7 +313,7 @@ https://mirror.lyrahosting.com/gnu/libsigsegv/libsigsegv-2.14.tar.gz https://www.x.org/archive/individual/lib/libSM-1.2.3.tar.bz2 https://github.com/libsndfile/libsndfile/releases/download/1.1.0/libsndfile-1.1.0.tar.xz https://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.74/libsoup-2.74.2.tar.xz -https://ftp.acc.umu.se/pub/gnome/sources/libsoup/3.0/libsoup-3.0.6.tar.xz +https://ftp.acc.umu.se/pub/gnome/sources/libsoup/3.0/libsoup-3.0.7.tar.xz https://www.libssh2.org/download/libssh2-1.10.0.tar.gz https://mirror.lyrahosting.com/gnu/libtasn1/libtasn1-4.18.0.tar.gz https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz @@ -406,7 +406,7 @@ https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.3.6.tar.gz https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-2.1.1.tar.gz https://github.com/MassOS-Linux/massos-welcome/archive/cc649f83e04f0daa880edf1df8e4d5165b79787c/massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c.tar.gz https://cdn.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz -https://archive.mesa3d.org/mesa-22.1.2.tar.xz +https://archive.mesa3d.org/mesa-22.1.3.tar.xz https://github.com/mesonbuild/meson/releases/download/0.62.2/meson-0.62.2.tar.gz https://www.x.org/archive/individual/app/mkfontscale-1.2.2.tar.xz https://github.com/videolabs/libmicrodns/releases/download/0.2.0/microdns-0.2.0.tar.xz diff --git a/utils/etc/lsb-release b/utils/etc/lsb-release index 71bd83d..b9c8af9 100644 --- a/utils/etc/lsb-release +++ b/utils/etc/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID="MassOS" -DISTRIB_RELEASE="development" -DISTRIB_CODENAME="development" +DISTRIB_RELEASE="2022.07" +DISTRIB_CODENAME="2022.07" DISTRIB_DESCRIPTION="MassOS" diff --git a/utils/etc/os-release b/utils/etc/os-release index 6f41d4a..26cdece 100644 --- a/utils/etc/os-release +++ b/utils/etc/os-release @@ -1,10 +1,10 @@ NAME="MassOS" -VERSION="development" -VERSION_ID="development" +VERSION="2022.07" +VERSION_ID="2022.07" ID="massos" -PRETTY_NAME="MassOS development" -BUILD_ID="development" -VERSION_CODENAME="development" +PRETTY_NAME="MassOS 2022.07" +BUILD_ID="2022.07" +VERSION_CODENAME="2022.07" LOGO="massos-logo" HOME_URL="https://massos.org" DOCUMENTATION_URL="https://github.com/MassOS-Linux/MassOS/wiki" diff --git a/utils/massos-release b/utils/massos-release index 23e3185..c87ca66 100644 --- a/utils/massos-release +++ b/utils/massos-release @@ -1 +1 @@ -development +2022.07