mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
Wed Feb 28 18:36:48 UTC 2024
d/parallel-20240222-noarch-1.txz: Upgraded.
kde/krita-5.2.2-x86_64-4.txz: Rebuilt.
Recompiled against libunibreak-6.0.
l/accountsservice-23.13.9-x86_64-1.txz: Upgraded.
Thanks to reddog83.
l/libass-0.17.1-x86_64-2.txz: Rebuilt.
Recompiled against libunibreak-6.0.
l/libunibreak-6.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/orc-0.4.38-x86_64-1.txz: Upgraded.
l/python-requests-2.31.0-x86_64-1.txz: Upgraded.
l/python-urllib3-2.2.1-x86_64-1.txz: Upgraded.
l/qt6-6.6.2_20240210_15b7e743-x86_64-1.txz: Added.
n/wpa_supplicant-2.10-x86_64-3.txz: Rebuilt.
Patched the implementation of PEAP in wpa_supplicant to prevent an
authentication bypass. For a successful attack, wpa_supplicant must be
configured to not verify the network's TLS certificate during Phase 1
authentication, and an eap_peap_decrypt vulnerability can then be abused
to skip Phase 2 authentication. The attack vector is sending an EAP-TLV
Success packet instead of starting Phase 2. This allows an adversary to
impersonate Enterprise Wi-Fi networks.
For more information, see:
https://www.cve.org/CVERecord?id=CVE-2023-52160
(* Security fix *)
xap/gparted-1.6.0-x86_64-1.txz: Upgraded.
This commit is contained in:
Patrick J Volkerding
Eric Hameleers
parent
d3c57a5548
commit
72065739ec
28 changed files with 3751 additions and 2882 deletions
|
|
@ -11,9 +11,44 @@
|
|||
<description>Tracking Slackware development in git.</description>
|
||||
<language>en-us</language>
|
||||
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
||||
<pubDate>Mon, 26 Feb 2024 20:09:43 GMT</pubDate>
|
||||
<lastBuildDate>Mon, 26 Feb 2024 21:05:09 GMT</lastBuildDate>
|
||||
<pubDate>Wed, 28 Feb 2024 18:36:48 GMT</pubDate>
|
||||
<lastBuildDate>Wed, 28 Feb 2024 19:34:13 GMT</lastBuildDate>
|
||||
<generator>maintain_current_git.sh v 1.17</generator>
|
||||
<item>
|
||||
<title>Wed, 28 Feb 2024 18:36:48 GMT</title>
|
||||
<pubDate>Wed, 28 Feb 2024 18:36:48 GMT</pubDate>
|
||||
<link>https://git.slackware.nl/current/tag/?h=20240228183648</link>
|
||||
<guid isPermaLink="false">20240228183648</guid>
|
||||
<description>
|
||||
<![CDATA[<pre>
|
||||
d/parallel-20240222-noarch-1.txz: Upgraded.
|
||||
kde/krita-5.2.2-x86_64-4.txz: Rebuilt.
|
||||
Recompiled against libunibreak-6.0.
|
||||
l/accountsservice-23.13.9-x86_64-1.txz: Upgraded.
|
||||
Thanks to reddog83.
|
||||
l/libass-0.17.1-x86_64-2.txz: Rebuilt.
|
||||
Recompiled against libunibreak-6.0.
|
||||
l/libunibreak-6.0-x86_64-1.txz: Upgraded.
|
||||
Shared library .so-version bump.
|
||||
l/orc-0.4.38-x86_64-1.txz: Upgraded.
|
||||
l/python-requests-2.31.0-x86_64-1.txz: Upgraded.
|
||||
l/python-urllib3-2.2.1-x86_64-1.txz: Upgraded.
|
||||
l/qt6-6.6.2_20240210_15b7e743-x86_64-1.txz: Added.
|
||||
n/wpa_supplicant-2.10-x86_64-3.txz: Rebuilt.
|
||||
Patched the implementation of PEAP in wpa_supplicant to prevent an
|
||||
authentication bypass. For a successful attack, wpa_supplicant must be
|
||||
configured to not verify the network's TLS certificate during Phase 1
|
||||
authentication, and an eap_peap_decrypt vulnerability can then be abused
|
||||
to skip Phase 2 authentication. The attack vector is sending an EAP-TLV
|
||||
Success packet instead of starting Phase 2. This allows an adversary to
|
||||
impersonate Enterprise Wi-Fi networks.
|
||||
For more information, see:
|
||||
https://www.cve.org/CVERecord?id=CVE-2023-52160
|
||||
(* Security fix *)
|
||||
xap/gparted-1.6.0-x86_64-1.txz: Upgraded.
|
||||
</pre>]]>
|
||||
</description>
|
||||
</item>
|
||||
<item>
|
||||
<title>Mon, 26 Feb 2024 20:09:43 GMT</title>
|
||||
<pubDate>Mon, 26 Feb 2024 20:09:43 GMT</pubDate>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,30 @@
|
|||
Wed Feb 28 18:36:48 UTC 2024
|
||||
d/parallel-20240222-noarch-1.txz: Upgraded.
|
||||
kde/krita-5.2.2-x86_64-4.txz: Rebuilt.
|
||||
Recompiled against libunibreak-6.0.
|
||||
l/accountsservice-23.13.9-x86_64-1.txz: Upgraded.
|
||||
Thanks to reddog83.
|
||||
l/libass-0.17.1-x86_64-2.txz: Rebuilt.
|
||||
Recompiled against libunibreak-6.0.
|
||||
l/libunibreak-6.0-x86_64-1.txz: Upgraded.
|
||||
Shared library .so-version bump.
|
||||
l/orc-0.4.38-x86_64-1.txz: Upgraded.
|
||||
l/python-requests-2.31.0-x86_64-1.txz: Upgraded.
|
||||
l/python-urllib3-2.2.1-x86_64-1.txz: Upgraded.
|
||||
l/qt6-6.6.2_20240210_15b7e743-x86_64-1.txz: Added.
|
||||
n/wpa_supplicant-2.10-x86_64-3.txz: Rebuilt.
|
||||
Patched the implementation of PEAP in wpa_supplicant to prevent an
|
||||
authentication bypass. For a successful attack, wpa_supplicant must be
|
||||
configured to not verify the network's TLS certificate during Phase 1
|
||||
authentication, and an eap_peap_decrypt vulnerability can then be abused
|
||||
to skip Phase 2 authentication. The attack vector is sending an EAP-TLV
|
||||
Success packet instead of starting Phase 2. This allows an adversary to
|
||||
impersonate Enterprise Wi-Fi networks.
|
||||
For more information, see:
|
||||
https://www.cve.org/CVERecord?id=CVE-2023-52160
|
||||
(* Security fix *)
|
||||
xap/gparted-1.6.0-x86_64-1.txz: Upgraded.
|
||||
+--------------------------+
|
||||
Mon Feb 26 20:09:43 UTC 2024
|
||||
a/mdadm-4.3-x86_64-1.txz: Upgraded.
|
||||
a/pciutils-3.11.1-x86_64-1.txz: Upgraded.
|
||||
|
|
|
|||
5739
FILELIST.TXT
5739
FILELIST.TXT
File diff suppressed because it is too large
Load diff
|
|
@ -507,6 +507,7 @@ gzip ./source/n/nc/nc.diff
|
|||
gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch
|
||||
gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch
|
||||
gzip ./source/n/wpa_supplicant/patches/allow-tlsv1.patch
|
||||
gzip ./source/n/wpa_supplicant/patches/8e6485a1bcb0baffdea9e55255a81270b768439c.patch
|
||||
gzip ./source/n/wpa_supplicant/doinst.sh
|
||||
gzip ./source/n/php/php-fpm.conf.diff
|
||||
gzip ./source/n/php/doinst.sh
|
||||
|
|
|
|||
|
|
@ -394,8 +394,9 @@ you are done." 22 74 10 \
|
|||
"python-zipp" "object wrapper for zip files" "on" \
|
||||
"python2-module-collection" "modules for python2" "on" \
|
||||
"qrencode" "QR Code encoding library" "on" \
|
||||
"qt5" "a C++ graphical user interface toolkit" "on" \
|
||||
"qt5" "Qt GUI toolkit, version 5" "on" \
|
||||
"qt5-webkit" "Qt web browser engine" "on" \
|
||||
"qt6" "Qt GUI toolkit, version 6" "on" \
|
||||
"qtkeychain" "Qt password storage API" "on" \
|
||||
"quazip" "C++ wrapper for Minizip" "on" \
|
||||
"readline" "Input library with editing" "on" \
|
||||
|
|
@ -446,7 +447,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qt6 qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -454,7 +455,7 @@ GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SD
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qt6 qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -394,8 +394,9 @@ you are done." 22 74 10 \
|
|||
"python-zipp" "object wrapper for zip files" "on" \
|
||||
"python2-module-collection" "modules for python2" "on" \
|
||||
"qrencode" "QR Code encoding library" "on" \
|
||||
"qt5" "a C++ graphical user interface toolkit" "on" \
|
||||
"qt5" "Qt GUI toolkit, version 5" "on" \
|
||||
"qt5-webkit" "Qt web browser engine" "on" \
|
||||
"qt6" "Qt GUI toolkit, version 6" "on" \
|
||||
"qtkeychain" "Qt password storage API" "on" \
|
||||
"quazip" "C++ wrapper for Minizip" "on" \
|
||||
"readline" "Input library with editing" "on" \
|
||||
|
|
@ -446,7 +447,7 @@ if [ $? = 1 -o $? = 255 ]; then
|
|||
rm -f $TMP/SeTpkgs
|
||||
> $TMP/SeTnewtag
|
||||
for pkg in \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qt6 qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
; do
|
||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||
done
|
||||
|
|
@ -454,7 +455,7 @@ GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SD
|
|||
fi
|
||||
cat /dev/null > $TMP/SeTnewtag
|
||||
for PACKAGE in \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
GConf Imath LibRaw M2Crypto Mako PyQt-builder PyQt5 PyQt5_sip QScintilla SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf a52dec aalib accountsservice adwaita-icon-theme alsa-lib alsa-oss alsa-plugins apr apr-util argon2 aspell aspell-en at-spi2-core atkmm audiofile avahi babl boost brotli cairo cairomm cfitsio chmlib clucene colord cryfs cryptopp cxxopts db48 dbus-glib dbus-python dconf dconf-editor desktop-file-utils djvulibre dotconf dvdauthor ebook-tools editorconfig-core-c eigen3 elfutils enchant esound espeak-ng exiv2 expat farstream ffmpeg fftw fluidsynth fmt freecell-solver freetype frei0r-plugins fribidi fuse fuse3 gc gcr gd gdbm gdk-pixbuf2 gdk-pixbuf2-xlib gegl gexiv2 gi-docgen giflib gjs glade glib glib-networking glib2 glibc glibc-i18n glibc-profile glibmm gmime gmm gmp gnome-keyring gnome-themes-extra gnu-efi gobject-introspection grantlee graphene graphite2 gsettings-desktop-schemas gsl gst-plugins-bad-free gst-plugins-base gst-plugins-good gst-plugins-libav gstreamer gtk+ gtk+2 gtk+3 gtk4 gtkmm2 gtkmm3 gtksourceview3 gtkspell gtkspell3 gvfs harfbuzz hicolor-icon-theme hunspell hyphen icon-naming-utils icu4c id3lib imagemagick immer isl iso-codes jansson jasper jemalloc jmtpfs json-c json-glib judy kdsoap keybinder3 keyutils lager lame lcms lcms2 lensfun libaio libao libappindicator libarchive libass libasyncns libatasmart libbluray libburn libcaca libcanberra libcap libcap-ng libcddb libcdio libcdio-paranoia libclc libcue libdaemon libdbusmenu libdbusmenu-qt libdeflate libdiscid libdmtx libdvdnav libdvdread libedit libev libevent libexif libfakekey libffi libglade libgnome-keyring libgnt libgphoto2 libgpod libgsf libgtop libgusb libhandy libical libid3tag libidl libidn libidn2 libieee1284 libimobiledevice libimobiledevice-glue libindicator libiodbc libjpeg-turbo libkarma libmad libmcrypt libmng libmpc libmtp libnice libnih libnjb libnl libnl3 libnotify libnsl libnss_nis libnvme libodfgen libogg liboggz liboil libopusenc libpaper libpcap libplacebo libplist libpng libproxy libpsl libptytty libqalculate libraw1394 librevenge librsvg libsamplerate libsass libseccomp libsecret libsigc++ libsigc++3 libsigsegv libsndfile libsodium libsoup libsoup3 libspectre libssh libssh2 libtasn1 libtheora libtiff libunibreak libunistring libunwind liburing libusb libusb-compat libusbmuxd libuv libvisio libvisual libvisual-plugins libvncserver libvorbis libvpx libwebp libwmf libwnck libwnck3 libwpd libwpg libxkbcommon libxklavier libxml2 libxslt libyaml libzip lmdb loudmouth lz4 lzo media-player-info mhash mlt mm mozilla-nss mozjs102 mpfr ncurses neon netpbm newt nodejs ocl-icd oniguruma openal-soft opencv openexr openjpeg opus opusfile orc pango pangomm parted pcaudiolib pcre pcre2 phonon phonon-backend-gstreamer pilot-link pipewire polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pulseaudio pycairo pycups pycurl pygobject pygobject3 pygtk pyparsing python-Jinja2 python-MarkupSafe python-PyYAML python-alabaster python-appdirs python-babel python-build python-calver python-certifi python-cffi python-chardet python-charset-normalizer python-distro python-dnspython python-docutils python-doxypypy python-doxyqml python-editables python-flit-core python-future python-glad2 python-hatchling python-html5lib python-idna python-imagesize python-importlib_metadata python-installer python-lxml python-markdown python-notify2 python-packaging python-pathspec python-pbr python-pillow python-pluggy python-ply python-psutil python-pycparser python-pygments python-pyproject-hooks python-pysol_cards python-pytz python-random2 python-requests python-sane python-setuptools_scm python-six python-smartypants python-snowballstemmer python-sphinx python-sphinx_rtd_theme python-tomli python-tomli-w python-trove-classifiers python-typogrify python-urllib3 python-webencodings python-wheel python-zipp python2-module-collection qrencode qt5 qt5-webkit qt6 qtkeychain quazip readline rpcsvc-proto rttr rubygem-asciidoctor sbc sdl serf sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 sof-firmware sound-theme-freedesktop speech-dispatcher speex speexdsp spirv-llvm-translator startup-notification svgalib system-config-printer t1lib taglib talloc tango-icon-theme tango-icon-theme-extras tdb tevent tidy-html5 utf8proc v4l-utils vid.stab vte wavpack wireplumber woff2 xapian-core xxHash zlib zstd zug zxing-cpp \
|
||||
; do
|
||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||
|
|
|
|||
|
|
@ -381,6 +381,7 @@ python2-module-collection:REC
|
|||
qrencode:REC
|
||||
qt5:REC
|
||||
qt5-webkit:REC
|
||||
qt6:REC
|
||||
qtkeychain:REC
|
||||
quazip:REC
|
||||
readline:REC
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3
|
||||
4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
From 7e9058c1edda71cd9aa457717ed8fed50cd49666 Mon Sep 17 00:00:00 2001
|
||||
From: nater1983 <naterussell83@gmail.com>
|
||||
Date: Sun, 25 Feb 2024 20:42:49 +0000
|
||||
Subject: [PATCH] Add option to disable Unit Tests
|
||||
|
||||
- /meson.build
|
||||
- /meson_options.txt
|
||||
---
|
||||
meson.build | 4 +++-
|
||||
meson_options.txt | 1 +
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- ./meson.build.orig 2023-03-27 14:27:39.000000000 -0500
|
||||
+++ ./meson.build 2024-02-27 12:42:47.098937158 -0600
|
||||
@@ -232,7 +232,9 @@
|
||||
subdir('doc/libaccountsservice')
|
||||
endif
|
||||
|
||||
-subdir('tests')
|
||||
+if get_option('tests')
|
||||
+ subdir('tests')
|
||||
+endif
|
||||
|
||||
configure_file(
|
||||
output: 'config.h',
|
||||
--- ./meson_options.txt.orig 2023-03-27 14:27:39.000000000 -0500
|
||||
+++ ./meson_options.txt 2024-02-27 12:43:12.139935773 -0600
|
||||
@@ -13,3 +13,4 @@
|
||||
|
||||
option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
|
||||
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
|
||||
+option('tests', type: 'boolean', value: true, description : 'Build unit tests')
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2017, 2020 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
|
@ -86,6 +86,9 @@ find . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Build without unit tests:
|
||||
cat $CWD/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch | patch -p1 --verbose || exit 1
|
||||
|
||||
# Configure, build, and install:
|
||||
export CFLAGS="$SLKCFLAGS"
|
||||
export CXXFLAGS="$SLKCFLAGS"
|
||||
|
|
@ -103,11 +106,12 @@ meson setup \
|
|||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--buildtype=release \
|
||||
-D admin_group=wheel \
|
||||
-D docbook=false \
|
||||
-D gtk_doc=true \
|
||||
-D elogind=true \
|
||||
-D systemdsystemunitdir=no \
|
||||
-Dadmin_group=wheel \
|
||||
-Ddocbook=false \
|
||||
-Dtests=false \
|
||||
-Dgtk_doc=true \
|
||||
-Delogind=true \
|
||||
-Dsystemdsystemunitdir=no \
|
||||
.. || exit 1
|
||||
"${NINJA:=ninja}" $NUMJOBS || exit 1
|
||||
DESTDIR=$PKG $NINJA install || exit 1
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
|||
|
||||
PKGNAM=libass
|
||||
VERSION=${VERSION:-$(echo libass-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
https://github.com/adah1972/libunibreak
|
||||
https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_0/libunibreak-6.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
|||
|
||||
PKGNAM=python-requests
|
||||
VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-3}
|
||||
BUILD=${BUILD:-1}
|
||||
|
||||
SRCNAM=requests
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# Copyright 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# Copyright 2017 Heinz Wiesinger, Amsterdam, NL
|
||||
# All rights reserved.
|
||||
#
|
||||
|
|
@ -61,7 +61,9 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
|
||||
|
||||
python3 setup.py install --root=$PKG || exit 1
|
||||
unshare -n python3 -m build --wheel --no-isolation || exit 1
|
||||
|
||||
python3 -m installer --destdir "$PKG" dist/*.whl || exit 1
|
||||
|
||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
||||
cp -a *.rst *.txt PKG-INFO \
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# customary to leave one space after the ':'.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
qt5: qt5 (a C++ graphical user interface toolkit)
|
||||
qt5: qt5 (Qt GUI toolkit, version 5)
|
||||
qt5:
|
||||
qt5: Qt is a complete and well-developed object-oriented framework for
|
||||
qt5: developing graphical user interface (GUI) applications using C++.
|
||||
|
|
|
|||
9
source/l/qt6/doinst.sh
Normal file
9
source/l/qt6/doinst.sh
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
if [ -x /usr/bin/update-desktop-database ]; then
|
||||
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
62
source/l/qt6/fetch_sources.sh
Executable file
62
source/l/qt6/fetch_sources.sh
Executable file
|
|
@ -0,0 +1,62 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands
|
||||
# Copyright 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
# permitted provided that the following conditions are met:
|
||||
#
|
||||
# 1. Redistributions of this script must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 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,
|
||||
# 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.
|
||||
|
||||
BRANCH="6.6.2"
|
||||
|
||||
rm -f qt-everywhere-src-*.tar*
|
||||
|
||||
git clone https://invent.kde.org/qt/qt/qt5.git
|
||||
|
||||
cd qt5
|
||||
git checkout v${BRANCH}
|
||||
./init-repository
|
||||
|
||||
# Sync qtwebengine version with the rest of qt5
|
||||
sed -i -E "s/6.6.(.*)/$BRANCH\"\)/" qtwebengine/.cmake.conf
|
||||
|
||||
for i in $(find . -type d -name "qt*" -maxdepth 1); do
|
||||
cd $i
|
||||
../qtbase/libexec/syncqt.pl -version $BRANCH
|
||||
cd ..
|
||||
done
|
||||
|
||||
# Not in the release tarball for 6.6.1:
|
||||
rm -rf README.git init-repository \
|
||||
qtcanvas3d qtfeedback qtgamepad qtpim qtqa qtrepotools qtsystems qtwebglplugin qtxmlpatterns \
|
||||
qtcharts/tools qtdatavis3d/tools qtgraphs/tools
|
||||
|
||||
VERSION="${BRANCH}_$(git log --format="%ad_%h" --date=short | head -n 1 | tr -d -)"
|
||||
LONGDATE="$(git log -1 --format=%cd --date=format:%c )"
|
||||
|
||||
cd ..
|
||||
|
||||
mv qt5 qt-everywhere-src-$VERSION
|
||||
|
||||
tar --exclude-vcs -cf qt-everywhere-src-$VERSION.tar qt-everywhere-src-$VERSION
|
||||
tar -cf qt5-gitmodules.tar qt-everywhere-src-$VERSION/*/.gitmodules qt-everywhere-src-$VERSION/.gitmodules
|
||||
tar --concatenate --file=qt-everywhere-src-$VERSION.tar qt5-gitmodules.tar
|
||||
plzip -9 -v qt-everywhere-src-$VERSION.tar
|
||||
touch -d "$LONGDATE" qt-everywhere-src-$VERSION.tar.lz
|
||||
|
||||
rm -rf qt-everywhere-src-$VERSION
|
||||
rm -f qt5-gitmodules.tar
|
||||
16
source/l/qt6/patches/nodejs-allow-32bit.patch
Normal file
16
source/l/qt6/patches/nodejs-allow-32bit.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
--- ./qtwebengine/configure.cmake.orig 2024-02-27 13:57:02.000000000 -0600
|
||||
+++ ./qtwebengine/configure.cmake 2024-02-27 17:49:26.845071893 -0600
|
||||
@@ -492,13 +492,6 @@
|
||||
MESSAGE "node.js version 14 or later is required."
|
||||
)
|
||||
add_check_for_support(
|
||||
- MODULES QtWebEngine
|
||||
- CONDITION NOT (Nodejs_ARCH STREQUAL "ia32") AND
|
||||
- NOT (Nodejs_ARCH STREQUAL "x86") AND
|
||||
- NOT (Nodejs_ARCH STREQUAL "arm")
|
||||
- MESSAGE "32bit version of Nodejs is not supported."
|
||||
-)
|
||||
-add_check_for_support(
|
||||
MODULES QtWebEngine QtPdf
|
||||
CONDITION Python3_EXECUTABLE
|
||||
MESSAGE "Python version 3.6 or later is required."
|
||||
11
source/l/qt6/patches/qt5.mysql.h.diff
Normal file
11
source/l/qt6/patches/qt5.mysql.h.diff
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200
|
||||
+++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
#include <QtCore/qt_windows.h>
|
||||
#endif
|
||||
|
||||
-#include <mysql.h>
|
||||
+#include <mysql/mysql.h>
|
||||
|
||||
#ifdef QT_PLUGIN
|
||||
#define Q_EXPORT_SQLDRIVER_MYSQL
|
||||
11
source/l/qt6/patches/qt6-3d_gcc13.patch
Normal file
11
source/l/qt6/patches/qt6-3d_gcc13.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200
|
||||
+++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200
|
||||
@@ -51,6 +51,7 @@
|
||||
#include "FBXUtil.h"
|
||||
#include <assimp/defs.h>
|
||||
#include <stdint.h>
|
||||
+#include <cstdint>
|
||||
#include <assimp/Exceptional.h>
|
||||
#include <assimp/ByteSwapper.h>
|
||||
#include <assimp/DefaultLogger.hpp>
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
Author: Patrick Franz <deltaone@debian.org>
|
||||
Description: Building on 32-bit architectures fails when trying to compress
|
||||
files in the devtools-frontend.
|
||||
Forwarded: not-needed
|
||||
|
||||
--- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
|
||||
+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
|
||||
@@ -75,7 +75,16 @@ async function main(argv) {
|
||||
const fileList = argv[fileListPosition + 1];
|
||||
const fileListContents = await readTextFile(fileList);
|
||||
const files = fileListContents.split(' ');
|
||||
- await Promise.all(files.map(filename => filename.trim()).map(compressFile));
|
||||
+ for (let i = 0; i < files.length; i++) {
|
||||
+ const fileName = files[i].trim();
|
||||
+ try {
|
||||
+ await compressFile(fileName);
|
||||
+ } catch (e) {
|
||||
+ console.log('Failing compressing', fileName);
|
||||
+ console.log(e);
|
||||
+ process.exit(1);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
main(process.argv).catch(err => {
|
||||
27
source/l/qt6/profile.d/qt6.csh
Normal file
27
source/l/qt6/profile.d/qt6.csh
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
#!/bin/csh
|
||||
# Environment path variables for the Qt package:
|
||||
if ( ! $?QT6DIR ) then
|
||||
# It's best to use the generic directory to avoid
|
||||
# compiling in a version-containing path:
|
||||
if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then
|
||||
setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6
|
||||
else
|
||||
# Find the newest Qt directory and set $QT6DIR to that:
|
||||
foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* )
|
||||
if ( -d $qtd ) then
|
||||
setenv QT6DIR $qtd
|
||||
endif
|
||||
end
|
||||
endif
|
||||
endif
|
||||
set path = ( $path $QT6DIR/bin )
|
||||
# Unfortunately Chromium and derived projects (including QtWebEngine) seem
|
||||
# to be suffering some bitrot when it comes to 32-bit support, so we are
|
||||
# forced to disable the seccomp filter sandbox on 32-bit or else all of these
|
||||
# applications crash. If anyone has a patch that gets these things running on
|
||||
# 32-bit without this workaround, please let volkerdi or alienBOB know, or
|
||||
# post your solution on LQ. Thanks. :-)
|
||||
file /bin/cat | grep -wq 32-bit
|
||||
if ( "$?" == "0" ) then
|
||||
setenv QTWEBENGINE_CHROMIUM_FLAGS "--disable-seccomp-filter-sandbox"
|
||||
endif
|
||||
26
source/l/qt6/profile.d/qt6.sh
Normal file
26
source/l/qt6/profile.d/qt6.sh
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
# Environment variables for the Qt package.
|
||||
#
|
||||
# It's best to use the generic directory to avoid
|
||||
# compiling in a version-containing path:
|
||||
if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then
|
||||
QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6
|
||||
else
|
||||
# Find the newest Qt directory and set $QT6DIR to that:
|
||||
for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do
|
||||
if [ -d $qtd ]; then
|
||||
QT6DIR=$qtd
|
||||
fi
|
||||
done
|
||||
fi
|
||||
PATH="$PATH:$QT6DIR/bin"
|
||||
export QT6DIR
|
||||
# Unfortunately Chromium and derived projects (including QtWebEngine) seem
|
||||
# to be suffering some bitrot when it comes to 32-bit support, so we are
|
||||
# forced to disable the seccomp filter sandbox on 32-bit or else all of these
|
||||
# applications crash. If anyone has a patch that gets these things running on
|
||||
# 32-bit without this workaround, please let volkerdi or alienBOB know, or
|
||||
# post your solution on LQ. Thanks. :-)
|
||||
if file /bin/cat | grep -wq 32-bit ; then
|
||||
export QTWEBENGINE_CHROMIUM_FLAGS="--disable-seccomp-filter-sandbox"
|
||||
fi
|
||||
326
source/l/qt6/qt6.SlackBuild
Executable file
326
source/l/qt6/qt6.SlackBuild
Executable file
|
|
@ -0,0 +1,326 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
# permitted provided that the following conditions are met:
|
||||
#
|
||||
# 1. Redistributions of this script must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 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,
|
||||
# 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.
|
||||
|
||||
# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org
|
||||
# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4
|
||||
#
|
||||
# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2023 Eric Hameleers, Eindhoven, NL
|
||||
# Modifications for qt 5.2.0 2013 by Michael James, AU
|
||||
# Modifications for qt 5.x by Eric Hameleers, Eindhoven, NL
|
||||
# Modifications for qt 6.x 2023, 2024 by Eric Hameleers, Eindhoven, NL
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=qt6
|
||||
VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
|
||||
BUILD=${BUILD:-1}
|
||||
PKGSRC=$(echo $VERSION | cut -d - -f 1)
|
||||
PKGVER=$(echo $VERSION | tr - _)
|
||||
|
||||
USE_CODECS=${USE_CODECS:-YES}
|
||||
SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-${PKGVER}-${ARCH}-${BUILD}${TAG}.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$ARCH" = "i486" ]; then
|
||||
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
|
||||
SLKLDFLAGS=""
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
SLKLDFLAGS=""
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
SLKLDFLAGS=""
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
SLKLDFLAGS="-L/usr/lib64"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
# To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
|
||||
# More permanent solution is to patch gcc:
|
||||
# http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
|
||||
SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
|
||||
SLKLDFLAGS=""
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
SLKLDFLAGS=""
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
case "$ARCH" in
|
||||
arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
|
||||
*) TARGET=$ARCH-slackware-linux ;;
|
||||
esac
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
|
||||
NINJAJOBS=${NINJAJOBS:-"$(echo $NUMJOBS | cut -f 2 -d j | tr -d ' ')"}
|
||||
export NINJAJOBS
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-${PKGNAM}
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
cd $TMP
|
||||
rm -rf qt-everywhere-src-$VERSION
|
||||
echo "Extracting qt-everywhere-src-$VERSION"
|
||||
tar xf $CWD/qt-everywhere-src-$VERSION.tar.?z* || exit 1
|
||||
cd qt-everywhere-src-$PKGSRC || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# If we build our own Qt, unset the QT-related environment variables,
|
||||
# so that a pre-existing Qt will not be picked up and create errors later:
|
||||
unset QTDIR
|
||||
unset QT6DIR
|
||||
NEWPATH="/usr/lib${LIBDIRSUFFIX}/${PKGNAM}/bin"
|
||||
for elem in $(echo $PATH | cut -d: --output-delimiter=' ' -f1-) ; do
|
||||
if ! $(echo "$elem"| grep -q /qt) ; then
|
||||
NEWPATH="$NEWPATH:$elem"
|
||||
fi
|
||||
done
|
||||
export PATH="$NEWPATH"
|
||||
|
||||
# Fix path to mysql header:
|
||||
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
|
||||
|
||||
# If PulseAudio is not found, use the _alsa $TAG and disable it in the build:
|
||||
if ! pkg-config --exists libpulse 2>/dev/null ; then
|
||||
USE_PULSEAUDIO=${USE_PULSEAUDIO:-"OFF"}
|
||||
TAG="${TAG}_alsa"
|
||||
else
|
||||
USE_PULSEAUDIO=${USE_PULSEAUDIO:-"ON"}
|
||||
TAG=${TAG:-""}
|
||||
fi
|
||||
|
||||
# Re-add support for 32bit architectures - Google no longer supports it:
|
||||
sed -i qtwebengine/src/3rdparty/chromium/BUILD.gn \
|
||||
-e 's/target_os != "linux" || /target_os == "linux" || /'
|
||||
pushd qtwebengine
|
||||
# Thanks Debian! See https://salsa.debian.org/qt-kde-team/qt6/qt6-webengine/-/tree/master/debian/patches
|
||||
cat $CWD/patches/qt6-webengine_32bit_compressing_files.patch | patch -p1 --verbose || exit 1
|
||||
popd
|
||||
cat $CWD/patches/nodejs-allow-32bit.patch | patch -p1 --verbose || exit 1
|
||||
|
||||
# GCC13 requires this include:
|
||||
cat $CWD/patches/qt6-3d_gcc13.patch | patch -p0 --verbose || exit 1
|
||||
|
||||
# The qtquick3dphysics only compiles on a limited set of architectures:
|
||||
case "${ARCH}" in
|
||||
i?86 | arm | s390) DO_PHYSX3D="OFF" ;;
|
||||
*) DO_PHYSX3D="ON" ;;
|
||||
esac
|
||||
|
||||
# Use our custom compiler and linker flags:
|
||||
sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
|
||||
-i qtbase/mkspecs/common/gcc-base.conf || exit 1
|
||||
sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
|
||||
-i qtbase/mkspecs/common/g++-unix.conf || exit 1
|
||||
|
||||
export CFLAGS="$SLKCFLAGS"
|
||||
export CXXFLAGS="$SLKCFLAGS"
|
||||
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
|
||||
export QTDIR="${TMP}/qt-everywhere-src-${PKGSRC}"
|
||||
export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
|
||||
export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
|
||||
cmake -S $(pwd) -B build-${PKGNAM} \
|
||||
-G Ninja \
|
||||
-Wno-dev \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_qtquick3dphysics:BOOL=${DO_PHYSX3D} \
|
||||
-DINSTALL_BINDIR=/usr/lib${LIBDIRSUFFIX}/qt6/bin \
|
||||
-DINSTALL_PUBLICBINDIR=usr/bin \
|
||||
-DINSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
|
||||
-DINSTALL_LIBEXECDIR=/usr/lib${LIBDIRSUFFIX}/qt6/libexec \
|
||||
-DINSTALL_ARCHDATADIR=/usr/lib${LIBDIRSUFFIX}/qt6 \
|
||||
-DINSTALL_DATADIR=/usr/share/qt6 \
|
||||
-DINSTALL_INCLUDEDIR=/usr/include/qt6 \
|
||||
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
|
||||
-DINSTALL_DOCDIR=/usr/doc/qt6-${PKGVER} \
|
||||
-DINSTALL_EXAMPLESDIR=/usr/doc/qt6-${PKGVER}/examples \
|
||||
-DFEATURE_libproxy=ON \
|
||||
-DFEATURE_no_direct_extern_access=ON \
|
||||
-DFEATURE_openssl_linked=ON \
|
||||
-DFEATURE_pulseaudio="${USE_PULSEAUDIO}" \
|
||||
-DFEATURE_system_sqlite=ON \
|
||||
-DFEATURE_system_xcb_xinput=ON \
|
||||
-DFEATURE_use_gold_linker=ON \
|
||||
-DFEATURE_webengine_proprietary_codecs="${USE_CODECS}" \
|
||||
-DFEATURE_webengine_system_ffmpeg="${SYSTEM_FFMPEG}" \
|
||||
-DFEATURE_webengine_system_pulseaudio="${USE_PULSEAUDIO}" \
|
||||
-DFEATURE_webengine_webrtc_pipewire=ON \
|
||||
-DQT_BUILD_EXAMPLES=OFF || exit 1
|
||||
cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1
|
||||
DESTDIR=$PKG cmake --install build-${PKGNAM} || exit 1
|
||||
|
||||
# Strip binaries:
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
||||
# Remove rpaths:
|
||||
for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
|
||||
if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
|
||||
patchelf --remove-rpath $file
|
||||
fi
|
||||
done
|
||||
|
||||
# Fix the path in prl files:
|
||||
find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
|
||||
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
|
||||
|
||||
# Install symlinks to the Qt6 binaries in the $PATH:
|
||||
mkdir -p $PKG/usr/bin
|
||||
pushd $PKG
|
||||
# Setting INSTALL_PUBLICBINDIR creates user_facing_tool_links.txt files:
|
||||
find $TMP/qt-everywhere-src-$PKGSRC/build-${PKGNAM} \
|
||||
-mindepth 1 -maxdepth 2 -name user_facing_tool_links.txt \
|
||||
| xargs cat | sort | uniq \
|
||||
| while read MYINP ; do ln -s $MYINP ; done
|
||||
popd
|
||||
|
||||
# Set the QT6DIR variable in the environment:
|
||||
mkdir -p $PKG/etc/profile.d
|
||||
sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.sh \
|
||||
> $PKG/etc/profile.d/$PKGNAM.sh
|
||||
sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.csh \
|
||||
> $PKG/etc/profile.d/$PKGNAM.csh
|
||||
chmod 0755 $PKG/etc/profile.d/*
|
||||
|
||||
# Add menu entries for all those hidden but great Qt applications:
|
||||
# Qt6 logo:
|
||||
mkdir -p $PKG/usr/share/icons/hicolor/{48x48,128x128}/apps
|
||||
convert qtdoc/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt6-logo.png
|
||||
convert qtdoc/doc/src/images/qt-logo.png -resize 128x128 $PKG/usr/share/icons/hicolor/128x128/apps/qt6-logo.png
|
||||
# Assistant icons
|
||||
install -p -m644 -D qttools/src/assistant/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/qt6-assistant.png
|
||||
install -p -m644 -D qttools/src/assistant/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-assistant.png
|
||||
# Designer icon
|
||||
install -p -m644 -D qttools/src/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-designer.png
|
||||
# QDbusViewer icons
|
||||
install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer.png $PKG/usr/share/icons/hicolor/32x32/apps/qt6-qdbusviewer.png
|
||||
install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-qdbusviewer.png
|
||||
# Linguist icons
|
||||
for icon in qttools/src/linguist/linguist/images/icons/linguist-*-32.png ; do
|
||||
size=$(echo $(basename ${icon}) | cut -d- -f2)
|
||||
install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/qt6-linguist.png
|
||||
done
|
||||
|
||||
# And the .desktop files too:
|
||||
mkdir -p $PKG/usr/share/applications
|
||||
cat <<EOF > $PKG/usr/share/applications/qt6-designer.desktop
|
||||
[Desktop Entry]
|
||||
Name=Qt6 Designer
|
||||
GenericName=Interface Designer
|
||||
Comment=Design GUIs for Qt6 applications
|
||||
Exec=designer6
|
||||
Icon=qt6-designer
|
||||
MimeType=application/x-designer;
|
||||
Terminal=false
|
||||
Encoding=UTF-8
|
||||
Type=Application
|
||||
Categories=Qt;Development;
|
||||
EOF
|
||||
cat <<EOF > $PKG/usr/share/applications/qt6-assistant.desktop
|
||||
[Desktop Entry]
|
||||
Name=Qt6 Assistant
|
||||
Comment=Shows Qt6 documentation and examples
|
||||
Exec=assistant6
|
||||
Icon=qt6-assistant
|
||||
Terminal=false
|
||||
Encoding=UTF-8
|
||||
Type=Application
|
||||
Categories=Qt;Development;Documentation;
|
||||
EOF
|
||||
cat <<EOF > $PKG/usr/share/applications/qt6-linguist.desktop
|
||||
[Desktop Entry]
|
||||
Name=Qt6 Linguist
|
||||
Comment=Add translations to Qt6 applications
|
||||
Exec=linguist6
|
||||
Icon=qt6-linguist
|
||||
MimeType=text/vnd.trolltech.linguist;application/x-linguist;
|
||||
Terminal=false
|
||||
Encoding=UTF-8
|
||||
Type=Application
|
||||
Categories=Qt;Development;
|
||||
EOF
|
||||
cat <<EOF > $PKG/usr/share/applications/qt6-qdbusviewer.desktop
|
||||
[Desktop Entry]
|
||||
Name=Qt6 QDbusViewer
|
||||
GenericName=Qt6 D-Bus Debugger
|
||||
Comment=Debug D-Bus applications
|
||||
Exec=qdbusviewer6
|
||||
Icon=qt6-qdbusviewer
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Qt;Development;Debugger;
|
||||
EOF
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER
|
||||
cp -a \
|
||||
README* LICENSE.* \
|
||||
qtwebengine/{CHROMIUM_VERSION,LICENSE.Chromium} \
|
||||
$PKG/usr/doc/$PKGNAM-$PKGVER
|
||||
find -maxdepth 2 -name LICENSES \
|
||||
| xargs -I{} cp -ia --parents {} $PKG/usr/doc/$PKGNAM-$PKGVER/
|
||||
if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt6/doc/html ]; then
|
||||
( cd $PKG/usr/doc/$PKGNAM-$PKGVER
|
||||
ln -sf /usr/lib${LIBDIRSUFFIX}/qt6/doc/html .
|
||||
)
|
||||
fi
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
cat $CWD/doinst.sh > $PKG/install/doinst.sh
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-${BUILD}${TAG}.txz
|
||||
19
source/l/qt6/slack-desc
Normal file
19
source/l/qt6/slack-desc
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# up the first '|' above the ':' following the base package name, and the '|'
|
||||
# on the right side marks the last column you can put a character in. You must
|
||||
# make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':'.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
qt6: qt6 (Qt GUI toolkit, version 6)
|
||||
qt6:
|
||||
qt6: Qt is a complete and well-developed object-oriented framework for
|
||||
qt6: developing graphical user interface (GUI) applications using C++.
|
||||
qt6:
|
||||
qt6: Homepage: http://www.qt.io/
|
||||
qt6:
|
||||
qt6:
|
||||
qt6:
|
||||
qt6:
|
||||
qt6:
|
||||
|
|
@ -0,0 +1,210 @@
|
|||
From 8e6485a1bcb0baffdea9e55255a81270b768439c Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Sat, 8 Jul 2023 19:55:32 +0300
|
||||
Subject: PEAP client: Update Phase 2 authentication requirements
|
||||
|
||||
The previous PEAP client behavior allowed the server to skip Phase 2
|
||||
authentication with the expectation that the server was authenticated
|
||||
during Phase 1 through TLS server certificate validation. Various PEAP
|
||||
specifications are not exactly clear on what the behavior on this front
|
||||
is supposed to be and as such, this ended up being more flexible than
|
||||
the TTLS/FAST/TEAP cases. However, this is not really ideal when
|
||||
unfortunately common misconfiguration of PEAP is used in deployed
|
||||
devices where the server trust root (ca_cert) is not configured or the
|
||||
user has an easy option for allowing this validation step to be skipped.
|
||||
|
||||
Change the default PEAP client behavior to be to require Phase 2
|
||||
authentication to be successfully completed for cases where TLS session
|
||||
resumption is not used and the client certificate has not been
|
||||
configured. Those two exceptions are the main cases where a deployed
|
||||
authentication server might skip Phase 2 and as such, where a more
|
||||
strict default behavior could result in undesired interoperability
|
||||
issues. Requiring Phase 2 authentication will end up disabling TLS
|
||||
session resumption automatically to avoid interoperability issues.
|
||||
|
||||
Allow Phase 2 authentication behavior to be configured with a new phase1
|
||||
configuration parameter option:
|
||||
'phase2_auth' option can be used to control Phase 2 (i.e., within TLS
|
||||
tunnel) behavior for PEAP:
|
||||
* 0 = do not require Phase 2 authentication
|
||||
* 1 = require Phase 2 authentication when client certificate
|
||||
(private_key/client_cert) is no used and TLS session resumption was
|
||||
not used (default)
|
||||
* 2 = require Phase 2 authentication in all cases
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/eap_peer/eap_config.h | 8 ++++++++
|
||||
src/eap_peer/eap_peap.c | 40 +++++++++++++++++++++++++++++++++++---
|
||||
src/eap_peer/eap_tls_common.c | 6 ++++++
|
||||
src/eap_peer/eap_tls_common.h | 5 +++++
|
||||
wpa_supplicant/wpa_supplicant.conf | 7 +++++++
|
||||
5 files changed, 63 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/eap_peer/eap_config.h b/src/eap_peer/eap_config.h
|
||||
index 26744ab68..58d5a1359 100644
|
||||
--- a/src/eap_peer/eap_config.h
|
||||
+++ b/src/eap_peer/eap_config.h
|
||||
@@ -471,6 +471,14 @@ struct eap_peer_config {
|
||||
* 1 = use cryptobinding if server supports it
|
||||
* 2 = require cryptobinding
|
||||
*
|
||||
+ * phase2_auth option can be used to control Phase 2 (i.e., within TLS
|
||||
+ * tunnel) behavior for PEAP:
|
||||
+ * 0 = do not require Phase 2 authentication
|
||||
+ * 1 = require Phase 2 authentication when client certificate
|
||||
+ * (private_key/client_cert) is no used and TLS session resumption was
|
||||
+ * not used (default)
|
||||
+ * 2 = require Phase 2 authentication in all cases
|
||||
+ *
|
||||
* EAP-WSC (WPS) uses following options: pin=Device_Password and
|
||||
* uuid=Device_UUID
|
||||
*
|
||||
diff --git a/src/eap_peer/eap_peap.c b/src/eap_peer/eap_peap.c
|
||||
index 12e30df29..608069719 100644
|
||||
--- a/src/eap_peer/eap_peap.c
|
||||
+++ b/src/eap_peer/eap_peap.c
|
||||
@@ -67,6 +67,7 @@ struct eap_peap_data {
|
||||
u8 cmk[20];
|
||||
int soh; /* Whether IF-TNCCS-SOH (Statement of Health; Microsoft NAP)
|
||||
* is enabled. */
|
||||
+ enum { NO_AUTH, FOR_INITIAL, ALWAYS } phase2_auth;
|
||||
};
|
||||
|
||||
|
||||
@@ -114,6 +115,19 @@ static void eap_peap_parse_phase1(struct eap_peap_data *data,
|
||||
wpa_printf(MSG_DEBUG, "EAP-PEAP: Require cryptobinding");
|
||||
}
|
||||
|
||||
+ if (os_strstr(phase1, "phase2_auth=0")) {
|
||||
+ data->phase2_auth = NO_AUTH;
|
||||
+ wpa_printf(MSG_DEBUG,
|
||||
+ "EAP-PEAP: Do not require Phase 2 authentication");
|
||||
+ } else if (os_strstr(phase1, "phase2_auth=1")) {
|
||||
+ data->phase2_auth = FOR_INITIAL;
|
||||
+ wpa_printf(MSG_DEBUG,
|
||||
+ "EAP-PEAP: Require Phase 2 authentication for initial connection");
|
||||
+ } else if (os_strstr(phase1, "phase2_auth=2")) {
|
||||
+ data->phase2_auth = ALWAYS;
|
||||
+ wpa_printf(MSG_DEBUG,
|
||||
+ "EAP-PEAP: Require Phase 2 authentication for all cases");
|
||||
+ }
|
||||
#ifdef EAP_TNC
|
||||
if (os_strstr(phase1, "tnc=soh2")) {
|
||||
data->soh = 2;
|
||||
@@ -142,6 +156,7 @@ static void * eap_peap_init(struct eap_sm *sm)
|
||||
data->force_peap_version = -1;
|
||||
data->peap_outer_success = 2;
|
||||
data->crypto_binding = OPTIONAL_BINDING;
|
||||
+ data->phase2_auth = FOR_INITIAL;
|
||||
|
||||
if (config && config->phase1)
|
||||
eap_peap_parse_phase1(data, config->phase1);
|
||||
@@ -454,6 +469,20 @@ static int eap_tlv_validate_cryptobinding(struct eap_sm *sm,
|
||||
}
|
||||
|
||||
|
||||
+static bool peap_phase2_sufficient(struct eap_sm *sm,
|
||||
+ struct eap_peap_data *data)
|
||||
+{
|
||||
+ if ((data->phase2_auth == ALWAYS ||
|
||||
+ (data->phase2_auth == FOR_INITIAL &&
|
||||
+ !tls_connection_resumed(sm->ssl_ctx, data->ssl.conn) &&
|
||||
+ !data->ssl.client_cert_conf) ||
|
||||
+ data->phase2_eap_started) &&
|
||||
+ !data->phase2_eap_success)
|
||||
+ return false;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/**
|
||||
* eap_tlv_process - Process a received EAP-TLV message and generate a response
|
||||
* @sm: Pointer to EAP state machine allocated with eap_peer_sm_init()
|
||||
@@ -568,6 +597,11 @@ static int eap_tlv_process(struct eap_sm *sm, struct eap_peap_data *data,
|
||||
" - force failed Phase 2");
|
||||
resp_status = EAP_TLV_RESULT_FAILURE;
|
||||
ret->decision = DECISION_FAIL;
|
||||
+ } else if (!peap_phase2_sufficient(sm, data)) {
|
||||
+ wpa_printf(MSG_INFO,
|
||||
+ "EAP-PEAP: Server indicated Phase 2 success, but sufficient Phase 2 authentication has not been completed");
|
||||
+ resp_status = EAP_TLV_RESULT_FAILURE;
|
||||
+ ret->decision = DECISION_FAIL;
|
||||
} else {
|
||||
resp_status = EAP_TLV_RESULT_SUCCESS;
|
||||
ret->decision = DECISION_UNCOND_SUCC;
|
||||
@@ -887,8 +921,7 @@ continue_req:
|
||||
/* EAP-Success within TLS tunnel is used to indicate
|
||||
* shutdown of the TLS channel. The authentication has
|
||||
* been completed. */
|
||||
- if (data->phase2_eap_started &&
|
||||
- !data->phase2_eap_success) {
|
||||
+ if (!peap_phase2_sufficient(sm, data)) {
|
||||
wpa_printf(MSG_DEBUG, "EAP-PEAP: Phase 2 "
|
||||
"Success used to indicate success, "
|
||||
"but Phase 2 EAP was not yet "
|
||||
@@ -1199,8 +1232,9 @@ static struct wpabuf * eap_peap_process(struct eap_sm *sm, void *priv,
|
||||
static bool eap_peap_has_reauth_data(struct eap_sm *sm, void *priv)
|
||||
{
|
||||
struct eap_peap_data *data = priv;
|
||||
+
|
||||
return tls_connection_established(sm->ssl_ctx, data->ssl.conn) &&
|
||||
- data->phase2_success;
|
||||
+ data->phase2_success && data->phase2_auth != ALWAYS;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
|
||||
index 6193b4bdb..966cbd6c7 100644
|
||||
--- a/src/eap_peer/eap_tls_common.c
|
||||
+++ b/src/eap_peer/eap_tls_common.c
|
||||
@@ -242,6 +242,12 @@ static int eap_tls_params_from_conf(struct eap_sm *sm,
|
||||
|
||||
sm->ext_cert_check = !!(params->flags & TLS_CONN_EXT_CERT_CHECK);
|
||||
|
||||
+ if (!phase2)
|
||||
+ data->client_cert_conf = params->client_cert ||
|
||||
+ params->client_cert_blob ||
|
||||
+ params->private_key ||
|
||||
+ params->private_key_blob;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/src/eap_peer/eap_tls_common.h b/src/eap_peer/eap_tls_common.h
|
||||
index 9ac00121f..334863413 100644
|
||||
--- a/src/eap_peer/eap_tls_common.h
|
||||
+++ b/src/eap_peer/eap_tls_common.h
|
||||
@@ -79,6 +79,11 @@ struct eap_ssl_data {
|
||||
* tls_v13 - Whether TLS v1.3 or newer is used
|
||||
*/
|
||||
int tls_v13;
|
||||
+
|
||||
+ /**
|
||||
+ * client_cert_conf: Whether client certificate has been configured
|
||||
+ */
|
||||
+ bool client_cert_conf;
|
||||
};
|
||||
|
||||
|
||||
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
|
||||
index f0b82443e..1b09f57d3 100644
|
||||
--- a/wpa_supplicant/wpa_supplicant.conf
|
||||
+++ b/wpa_supplicant/wpa_supplicant.conf
|
||||
@@ -1370,6 +1370,13 @@ fast_reauth=1
|
||||
# * 0 = do not use cryptobinding (default)
|
||||
# * 1 = use cryptobinding if server supports it
|
||||
# * 2 = require cryptobinding
|
||||
+# 'phase2_auth' option can be used to control Phase 2 (i.e., within TLS
|
||||
+# tunnel) behavior for PEAP:
|
||||
+# * 0 = do not require Phase 2 authentication
|
||||
+# * 1 = require Phase 2 authentication when client certificate
|
||||
+# (private_key/client_cert) is no used and TLS session resumption was
|
||||
+# not used (default)
|
||||
+# * 2 = require Phase 2 authentication in all cases
|
||||
# EAP-WSC (WPS) uses following options: pin=<Device Password> or
|
||||
# pbc=1.
|
||||
#
|
||||
--
|
||||
cgit v1.2.3-18-g5258
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
|||
|
||||
PKGNAM=wpa_supplicant
|
||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-2}
|
||||
BUILD=${BUILD:-3}
|
||||
|
||||
SRCVERSION=$(printf $VERSION | tr _ -)
|
||||
|
||||
|
|
@ -91,6 +91,9 @@ zcat $CWD/patches/wpa_supplicant-quiet-scan-results-message.patch.gz | patch -p1
|
|||
# Allow legacy tls to avoid breaking WPA2-Enterprise:
|
||||
zcat $CWD/patches/allow-tlsv1.patch.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
# CVE-2023-52160:
|
||||
zcat $CWD/patches/8e6485a1bcb0baffdea9e55255a81270b768439c.patch.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
cd wpa_supplicant
|
||||
|
||||
# Create the configuration file for building wpa_supplicant:
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@ gparted: * Grow or shrink your C: drive
|
|||
gparted: * Create space for new operating systems
|
||||
gparted: * Attempt data rescue from lost partitions
|
||||
gparted:
|
||||
gparted: http://gparted.sourceforge.net/
|
||||
gparted: https://gparted.sourceforge.net/
|
||||
gparted:
|
||||
|
|
|
|||
Loading…
Reference in a new issue