diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -5,7 +5,7 @@ libncursesw.so.5 libpam.so.0 libpam_misc.so.0 -libpython2.7.so.1.0 +libpython3.6m.so.1.0 libreadline.so.6 librt.so.1 libsystemd.so.0 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,12 +1,13 @@ name : util-linux -version : 2.33.1 -release : 24 +version : 2.33.2 +release : 25 source : - - https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz : c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21 -homepage : https://freecode.com/projects/util-linux + - https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.2.tar.xz : 631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97 license : - BSD-3-Clause + - BSD-4-Clause-UC - GPL-2.0-only + - GPL-2.0-or-later - LGPL-2.1-or-later - Public-Domain component : system.base @@ -17,19 +18,31 @@ autodep : no devel : yes builddeps : + - pkgconfig(python3) - pkgconfig32(zlib) + # These are only needed for tests + - pkgconfig32(ncursesw) + - pkgconfig32(liblzma) + - pkgconfig32(libsystemd) + - libgcrypt-32bit-devel + - pam-32bit-devel +rundeps : + - python3 setup : | # Fix usage with musl export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" if [[ ! -z "${EMUL32BUILD}" ]]; then - %configure --prefix=/usr \ - --enable-libmount-support-mtab + %configure --disable-pylibmount \ + --enable-libmount-support-mtab \ + --prefix=/usr \ + --with-python=3 else - %configure --disable-login \ + %configure --disable-chfn-chsh \ + --disable-login \ --disable-nologin \ - --disable-chfn-chsh \ --disable-su \ - --enable-libmount-support-mtab + --enable-libmount-support-mtab \ + --with-python=3 fi build : | if [[ ! -z "${EMUL32BUILD}" ]]; then @@ -49,3 +62,7 @@ install -m 00755 $pkgfiles/arch $installdir/bin/arch rm -v $installdir/usr/share/bash-completion/completions/{mount,umount,rfkill} fi +# Tests compile but they are not run because of +# "Ignore util-linux test suite [non-root UID expected]." +#check : | +# %make check diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -1,20 +1,21 @@ util-linux - https://freecode.com/projects/util-linux - Philipp Trulson - philipp@trulson.de + Fabio Forni + livingsilver94.solus@redaril.me BSD-3-Clause + BSD-4-Clause-UC GPL-2.0-only + GPL-2.0-or-later LGPL-2.1-or-later Public-Domain system.base util-linux (Essential Linux utilties) Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more. - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus util-linux @@ -122,10 +123,10 @@ /usr/bin/wall /usr/bin/whereis /usr/bin/x86_64 - /usr/lib/python2.7/site-packages/libmount/__init__.py - /usr/lib/python2.7/site-packages/libmount/__init__.pyc - /usr/lib/python2.7/site-packages/libmount/__init__.pyo - /usr/lib/python2.7/site-packages/libmount/pylibmount.so + /usr/lib/python3.6/site-packages/libmount/__init__.py + /usr/lib/python3.6/site-packages/libmount/__pycache__/__init__.cpython-36.opt-1.pyc + /usr/lib/python3.6/site-packages/libmount/__pycache__/__init__.cpython-36.pyc + /usr/lib/python3.6/site-packages/libmount/pylibmount.so /usr/lib/systemd/system/fstrim.service /usr/lib/systemd/system/fstrim.timer /usr/lib/systemd/system/uuidd.service @@ -400,7 +401,7 @@ emul32 - util-linux + util-linux /usr/lib32/libblkid.so.1 @@ -422,8 +423,8 @@ programming.devel - util-linux-devel - util-linux-32bit + util-linux-devel + util-linux-32bit /usr/lib32/libblkid.a @@ -450,7 +451,7 @@ system.devel - util-linux + util-linux /usr/include/blkid/blkid.h @@ -476,12 +477,12 @@ - - 2019-02-22 - 2.33.1 + + 2019-05-10 + 2.33.2 Packaging update - Philipp Trulson - philipp@trulson.de + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file