upgrade to 2.0

README.md

@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 

common/environment/setup/install.sh

@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }

common/shlibs

@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1

common/travis/license.lst

@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1

srcpkgs/0ad-data/template

@@ -1,14 +1,14 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in