Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10856191
D6194.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D6194.id.diff
View Options
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 @@
<PISI>
<Source>
<Name>util-linux</Name>
- <Homepage>https://freecode.com/projects/util-linux</Homepage>
<Packager>
- <Name>Philipp Trulson</Name>
- <Email>philipp@trulson.de</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>BSD-3-Clause</License>
+ <License>BSD-4-Clause-UC</License>
<License>GPL-2.0-only</License>
+ <License>GPL-2.0-or-later</License>
<License>LGPL-2.1-or-later</License>
<License>Public-Domain</License>
<PartOf>system.base</PartOf>
<Summary xml:lang="en">util-linux (Essential Linux utilties)</Summary>
<Description xml:lang="en">Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>util-linux</Name>
@@ -122,10 +123,10 @@
<Path fileType="executable">/usr/bin/wall</Path>
<Path fileType="executable">/usr/bin/whereis</Path>
<Path fileType="executable">/usr/bin/x86_64</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/libmount/__init__.py</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/libmount/__init__.pyc</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/libmount/__init__.pyo</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/libmount/pylibmount.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/libmount/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/libmount/__pycache__/__init__.cpython-36.opt-1.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/libmount/__pycache__/__init__.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/libmount/pylibmount.so</Path>
<Path fileType="library">/usr/lib/systemd/system/fstrim.service</Path>
<Path fileType="library">/usr/lib/systemd/system/fstrim.timer</Path>
<Path fileType="library">/usr/lib/systemd/system/uuidd.service</Path>
@@ -400,7 +401,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="24">util-linux</Dependency>
+ <Dependency release="25">util-linux</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libblkid.so.1</Path>
@@ -422,8 +423,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="24">util-linux-devel</Dependency>
- <Dependency release="24">util-linux-32bit</Dependency>
+ <Dependency release="25">util-linux-devel</Dependency>
+ <Dependency release="25">util-linux-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libblkid.a</Path>
@@ -450,7 +451,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="24">util-linux</Dependency>
+ <Dependency release="25">util-linux</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/blkid/blkid.h</Path>
@@ -476,12 +477,12 @@
</Files>
</Package>
<History>
- <Update release="24">
- <Date>2019-02-22</Date>
- <Version>2.33.1</Version>
+ <Update release="25">
+ <Date>2019-05-10</Date>
+ <Version>2.33.2</Version>
<Comment>Packaging update</Comment>
- <Name>Philipp Trulson</Name>
- <Email>philipp@trulson.de</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Jun 15 2023, 8:30 PM (8 w, 19 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5820746
Default Alt Text
D6194.id.diff (6 KB)
Attached To
Mode
D6194: Update util-linux to 2.33.2
Attached
Detach File
Event Timeline
Log In to Comment