emulators/linux_base-rl9: integrate devel/linux-rl9-libsigsegv into linux_base (+)

[g]awk and grep utilities depends on libsigsegv.so.2.0.6
Integrate devel/linux-rl9-libsigsegv into the emulators/linux_base-rl9 package
to resolve missed dependency
Drop dedicated devel/linux-rl9-libsigsegv port
Bump all linux-rl9-libsigsegv consumers to track changed dependency

PR:		286032
This commit is contained in:
Dima Panov 2025-04-15 20:11:27 +03:00
parent 6ce9e2dd2d
commit 6f110064b7
No known key found for this signature in database
GPG key ID: FB8BA09DD5398F29
19 changed files with 46 additions and 63 deletions

1
MOVED
View file

@ -4307,3 +4307,4 @@ devel/py-blist||2025-04-04|Has expired: Abandoned project, no consumers, no mode
textproc/rubygem-case_transform61||2025-04-04|Has expired: Uses EOL version 6.1.X of Rails
lang/python-doc-pdf-letter|lang/python-doc-pdf-a4|2025-04-09|Letter-size PDF no longer provided since 3.12
net-im/py-punjab||2025-04-13|Has expired: Abandoned project, not compatible with decent python/twisted
devel/linux-rl9-libsigsegv|emulators/linux_base-rl9|2025-04-15|Integrated into linux_base-rl9

View file

@ -122,7 +122,6 @@ _linux_rl9_libpsl= linux-rl9-libpsl>0:dns/linux-rl9-libpsl
_linux_${linux_ARGS}_librsvg2= linux-${linux_ARGS}-librsvg2>0:graphics/linux-${linux_ARGS}-librsvg2
_linux_rl9_libsecret= linux-rl9-libsecret>0:security/linux-rl9-libsecret
_linux_${linux_ARGS}_libsigc++20= linux-${linux_ARGS}-libsigc++20>0:devel/linux-${linux_ARGS}-libsigc++20
_linux_rl9_libsigsegv= linux-rl9-libsigsegv>0:devel/linux-rl9-libsigsegv
_linux_rl9_libsoup= linux-rl9-libsoup>0:devel/linux-rl9-libsoup
_linux_${linux_ARGS}_libsndfile= linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile
_linux_rl9_libssh= linux-rl9-libssh>0:security/linux-rl9-libssh

View file

@ -1,7 +1,7 @@
PORTNAME= alsa-plugins
PORTVERSION= 1.2.7.1
DISTVERSIONSUFFIX= -1.el9
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= audio linux
MASTER_SITES= ROCKY_LINUX
MASTER_SITE_SUBDIR= ${LINUX_DIST_VER}/BaseOS/source/tree/Packages/a/ \
@ -19,7 +19,7 @@ LICENSE= LGPL21+
USES= autoreconf:build gmake libtool:build linux:rl9 pkgconfig
USE_LDCONFIG= yes
USE_LINUX= alsalib:build,run alsa-lib-devel:build base:build devtools:build libsigsegv:build,run
USE_LINUX= alsalib:build,run alsa-lib-devel:build base:build devtools:build
USE_LINUX_PREFIX=yes
CONFIG_ARGS= --disable-static --disable-mix --disable-usbstream \

View file

@ -1557,7 +1557,6 @@
SUBDIR += linux-rl9-libgfortran
SUBDIR += linux-rl9-libpciaccess
SUBDIR += linux-rl9-libsigc++20
SUBDIR += linux-rl9-libsigsegv
SUBDIR += linux-rl9-libsoup
SUBDIR += linux-rl9-libthai
SUBDIR += linux-rl9-libtool-ltdl

View file

@ -1,6 +1,6 @@
PORTNAME= devtools
PORTVERSION= ${LINUX_DIST_VER}
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= devel
MAINTAINER= emulation@FreeBSD.org
@ -11,7 +11,7 @@ WWW= https://gcc.gnu.org/
USES= linux:rl9
USE_LDCONFIG= yes
USE_LINUX= elfutils-libs libgfortran libsigsegv
USE_LINUX= elfutils-libs libgfortran
USE_LINUX_RPM= yes
WANT_LINUX32= yes

View file

@ -1,22 +0,0 @@
PORTNAME= libsigsegv
PORTVERSION= 2.13
DISTVERSIONSUFFIX= -4.el9
PORTREVISION= 1
CATEGORIES= devel linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Handling page faults in user mode (Rocky Linux ${LINUX_DIST_VER})
WWW= https://www.gnu.org/software/libsigsegv/
USES= linux:rl9
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
WANT_LINUX32= yes
CONFLICTS= linux-c7-${PORTNAME}
DESCR= ${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

View file

@ -1,9 +0,0 @@
TIMESTAMP = 1731425658
SHA256 (rocky/l/libsigsegv-2.13-4.el9.aarch64.rpm) = 1935c944375f3bf40913bbda2cd87bbaf25a475be51c1662c24f54eb04da584b
SIZE (rocky/l/libsigsegv-2.13-4.el9.aarch64.rpm) = 27124
SHA256 (rocky/l/libsigsegv-2.13-4.el9.i686.rpm) = 312f6e760effbf2019985c86212d9ee73051b524918281ff7b0f229f6736da6a
SIZE (rocky/l/libsigsegv-2.13-4.el9.i686.rpm) = 27681
SHA256 (rocky/l/libsigsegv-2.13-4.el9.x86_64.rpm) = a80701bd3f67994493b1a14e043d9212032c86fd24374c309cf2b7006900f4da
SIZE (rocky/l/libsigsegv-2.13-4.el9.x86_64.rpm) = 27135
SHA256 (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 36dc113c8837b27c3c12b021e05786b69c2014519ed4c9f5354436cd80e8b1a4
SIZE (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 471565

View file

@ -1,7 +0,0 @@
usr/lib/.build-id/bd/3a64916c76cf377d71563f0cc08dd3642c2b0f
usr/lib64/libsigsegv.so.2
usr/lib64/libsigsegv.so.2.0.6
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/licenses/libsigsegv/COPYING

View file

@ -1,10 +0,0 @@
usr/lib/.build-id/dc/6c919a45d4cdcc1e9aa671ba513dfc1350d776
usr/lib/.build-id/ef/55a1e1729fd6ac859ca7c25898e3314e1cb69c
usr/lib/libsigsegv.so.2
usr/lib/libsigsegv.so.2.0.6
usr/lib64/libsigsegv.so.2
usr/lib64/libsigsegv.so.2.0.6
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/licenses/libsigsegv/COPYING

View file

@ -17,7 +17,7 @@ USE_LINUX= alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \
graphite2 gsm gstreamer1 gstreamer1-libav gtk2 gtk3 harfbuzz icu \
jasper jbigkit jpeg libassuan libasyncns libdrm libepoxy libevent \
libgcrypt libgfortran libglvnd libgpg-error libidn2 libksba libnghttp2 libogg \
libpciaccess libproxy libpsl librsvg2 libsecret libsigc++20 libsigsegv \
libpciaccess libproxy libpsl librsvg2 libsecret libsigc++20 \
libsndfile libsoup libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \
libtracker-sparql libunistring libusb libv4l libva libvdpau \
libvorbis libvpx libxcrypt libxkbcommon libxml2 libxslt llvm \

View file

@ -1,6 +1,6 @@
PORTNAME= rl9
PORTVERSION= ${LINUX_DIST_VER}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= emulators linux
PKGNAMEPREFIX= linux_base-
EXTRACT_ONLY= ${DISTFILES:N*${SRC_SUFX}*:Nf/filesystem-*:C/:[^:]+$//}
@ -15,6 +15,8 @@ USE_LINUX= # empty
USE_LINUX_RPM= yes
WANT_LINUX32= yes
CONFLICTS_INSTALL= linux-${linux_ARGS}-libsigsegv
.include "${.CURDIR}/Makefile.version"
BIN_DISTNAMES= bash-${bash_ver} \
@ -67,6 +69,7 @@ LIB_DISTNAMES= bzip2-libs-${bzip2_ver} \
libmount-${util_ver} \
libselinux-${selinux_ver} \
libsepol-${sepol_ver} \
libsigsegv-${libsigsegv_ver} \
libsmartcols-${util_ver} \
libstdc++-${gcc_ver} \
libuuid-${util_ver} \
@ -124,6 +127,7 @@ SRC_DISTFILES= acl-${libacl_ver}${SRC_SUFX}:SOURCE \
libgudev-${libgudev_ver}${SRC_SUFX}:SOURCE \
libselinux-${selinux_ver}${SRC_SUFX}:SOURCE \
libsepol-${sepol_ver}${SRC_SUFX}:SOURCE \
libsigsegv-${libsigsegv_ver}${SRC_SUFX}:SOURCE \
libverto-${libverto_ver}${SRC_SUFX}:SOURCE \
mtdev-${mtdev_ver}${SRC_SUFX}:SOURCE \
ncurses-${ncurses_ver}${SRC_SUFX}:SOURCE \

View file

@ -31,6 +31,7 @@ libevdev_ver= 1.11.0-3.el9
libffi_ver= 3.4.2-8.el9
libgudev_ver= 237-1.el9
libnattr_ver= 2.5.1-3.el9
libsigsegv_ver= 2.13-4.el9
libverto_ver= 0.3.2-3.el9
mtdev_ver= 1.1.5-22.el9
ncurses_ver= 6.2-10.20210508.el9

View file

@ -1,4 +1,4 @@
TIMESTAMP = 1740011706
TIMESTAMP = 1744723146
SHA256 (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 9f707e8d1046381c9b4a4df6a6674327df6ffe0298d48e1750972212c97aafad
SIZE (rocky/b/basesystem-11-13.el9.0.1.noarch.rpm) = 6565
SHA256 (rocky/b/bash-5.1.8-9.el9.aarch64.rpm) = f6b8bbdbd96ecb8d240a4d3c4a038f58faeab170015b07c7096d02157838279d
@ -235,6 +235,12 @@ SHA256 (rocky/l/libsepol-3.6-1.el9.i686.rpm) = e982b8a6e2ed94d01d992b56d5b3c2f6d
SIZE (rocky/l/libsepol-3.6-1.el9.i686.rpm) = 351074
SHA256 (rocky/l/libsepol-3.6-1.el9.x86_64.rpm) = d58084e91e5f6d091b40a9485b52a3099dbcd82c48a9a60520d14a5aad2406fd
SIZE (rocky/l/libsepol-3.6-1.el9.x86_64.rpm) = 336922
SHA256 (rocky/l/libsigsegv-2.13-4.el9.aarch64.rpm) = 1935c944375f3bf40913bbda2cd87bbaf25a475be51c1662c24f54eb04da584b
SIZE (rocky/l/libsigsegv-2.13-4.el9.aarch64.rpm) = 27124
SHA256 (rocky/l/libsigsegv-2.13-4.el9.i686.rpm) = 312f6e760effbf2019985c86212d9ee73051b524918281ff7b0f229f6736da6a
SIZE (rocky/l/libsigsegv-2.13-4.el9.i686.rpm) = 27681
SHA256 (rocky/l/libsigsegv-2.13-4.el9.x86_64.rpm) = a80701bd3f67994493b1a14e043d9212032c86fd24374c309cf2b7006900f4da
SIZE (rocky/l/libsigsegv-2.13-4.el9.x86_64.rpm) = 27135
SHA256 (rocky/l/libsmartcols-2.37.4-20.el9.aarch64.rpm) = 540dd30afe7d5ea12916fd4ff1d771673a7cdd103e144014560109b4d027d869
SIZE (rocky/l/libsmartcols-2.37.4-20.el9.aarch64.rpm) = 62175
SHA256 (rocky/l/libsmartcols-2.37.4-20.el9.i686.rpm) = 4924bb362ffa06e682d46fafd453bf9bd0965b54003903ffb8c6f9eb399ad756
@ -445,6 +451,8 @@ SHA256 (rocky/l/libselinux-3.6-1.el9.src.rpm) = 2db2d5d2ad87a9b28eae6cb7c5dfab2b
SIZE (rocky/l/libselinux-3.6-1.el9.src.rpm) = 265639
SHA256 (rocky/l/libsepol-3.6-1.el9.src.rpm) = ae509bd810045681bf3c603ba0f70096809833a3127fe21218840ebaf5e469b5
SIZE (rocky/l/libsepol-3.6-1.el9.src.rpm) = 534494
SHA256 (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 36dc113c8837b27c3c12b021e05786b69c2014519ed4c9f5354436cd80e8b1a4
SIZE (rocky/l/libsigsegv-2.13-4.el9.src.rpm) = 471565
SHA256 (rocky/l/libverto-0.3.2-3.el9.src.rpm) = 08f0b27aaf3b288e10ab3c1068ee09f3f2afe036879787d3f66b871ef161cb33
SIZE (rocky/l/libverto-0.3.2-3.el9.src.rpm) = 394523
SHA256 (rocky/m/mtdev-1.1.5-22.el9.src.rpm) = 6c5c7d9595a3accbc75aa61d8a43847a53b893540b1c6766621cce875fb9b6e5

View file

@ -774,6 +774,7 @@ usr/lib/.build-id/bc/70bc5a44c0c84da5a32f5617d4052079ca0632
usr/lib/.build-id/bc/9788e1a74f3b943bcb4e56f29cd27081f45c9c
usr/lib/.build-id/bc/d445cd41358150f6dab338483ad46b86133498
usr/lib/.build-id/bc/ef23bb1b2db2f32674eede07f5f598600cf7b2
usr/lib/.build-id/bd/3a64916c76cf377d71563f0cc08dd3642c2b0f
usr/lib/.build-id/bd/8f2fde312b98e2866cc99d404dfeb2aad48f28
usr/lib/.build-id/bd/dc065a42841a1c70b262de6d022d677089770b
usr/lib/.build-id/be/ab4f34ca1333bb518a7acc1203b899d486afbd
@ -1411,6 +1412,8 @@ usr/lib64/libresolv.so.2
usr/lib64/librt.so.1
usr/lib64/libselinux.so.1
usr/lib64/libsepol.so.2
usr/lib64/libsigsegv.so.2
usr/lib64/libsigsegv.so.2.0.6
usr/lib64/libslang.so.2
usr/lib64/libslang.so.2.3.2
usr/lib64/libsmartcols.so.1
@ -1696,6 +1699,9 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
%%PORTDOCS%%usr/share/doc/libevdev/COPYING
%%PORTDOCS%%usr/share/doc/libffi/README.md
%%PORTDOCS%%usr/share/doc/libgudev/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/AUTHORS
%%PORTDOCS%%usr/share/doc/libsigsegv/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/README
%%PORTDOCS%%usr/share/doc/libverto/AUTHORS
%%PORTDOCS%%usr/share/doc/libverto/ChangeLog
%%PORTDOCS%%usr/share/doc/libverto/NEWS
@ -1822,6 +1828,7 @@ usr/share/licenses/libmount/COPYING
usr/share/licenses/libmount/COPYING.LGPL-2.1-or-later
usr/share/licenses/libselinux/LICENSE
usr/share/licenses/libsepol/LICENSE
usr/share/licenses/libsigsegv/COPYING
usr/share/licenses/libsmartcols/COPYING
usr/share/licenses/libsmartcols/COPYING.LGPL-2.1-or-later
usr/share/licenses/libuuid/COPYING

View file

@ -1180,6 +1180,7 @@ usr/lib/.build-id/db/6e9153381f1f8a6dd28b96ae6ce16c6170f75c
usr/lib/.build-id/db/745e3accb90deeee150feda7e4a1eae1581c68
usr/lib/.build-id/db/acb84aaef986dd3eb7fb04b90014241038a67d
usr/lib/.build-id/dc/045cb4d1c446e0da68594aead14f77227933ec
usr/lib/.build-id/dc/6c919a45d4cdcc1e9aa671ba513dfc1350d776
usr/lib/.build-id/dc/8fb4bc44b44001849568ea8fbb43644780747b
usr/lib/.build-id/dc/e36e3728dda8894bcae875a31705f9694401bc
usr/lib/.build-id/dd/0e01313179969d8991222d262c4fb98775937a
@ -1257,6 +1258,7 @@ usr/lib/.build-id/ee/44a7dbf77ceda0e8c90770c5ae088aef18938c
usr/lib/.build-id/ee/a905ae972073934f747f732891abb38da6596a
usr/lib/.build-id/ee/c6332ce279a71f4d350da89dc563d339927b5d
usr/lib/.build-id/ef/345ecf247e01022dc8ce4ee0f02d1b8432f0fd
usr/lib/.build-id/ef/55a1e1729fd6ac859ca7c25898e3314e1cb69c
usr/lib/.build-id/ef/892035f0f947ac78c4ef86ce9f30687fedc936
usr/lib/.build-id/ef/8ef837eafca150b87e55412b4d330cd29c293c
usr/lib/.build-id/ef/998fa28f04a099e2de6fcc762ed911c4e5196e
@ -1752,6 +1754,8 @@ usr/lib/librt.so.1
usr/lib/libSegFault.so
usr/lib/libselinux.so.1
usr/lib/libsepol.so.2
usr/lib/libsigsegv.so.2
usr/lib/libsigsegv.so.2.0.6
usr/lib/libslang.so.2
usr/lib/libslang.so.2.3.2
usr/lib/libsmartcols.so.1
@ -2230,6 +2234,8 @@ usr/lib64/libresolv.so.2
usr/lib64/librt.so.1
usr/lib64/libselinux.so.1
usr/lib64/libsepol.so.2
usr/lib64/libsigsegv.so.2
usr/lib64/libsigsegv.so.2.0.6
usr/lib64/libslang.so.2
usr/lib64/libslang.so.2.3.2
usr/lib64/libsmartcols.so.1
@ -2521,6 +2527,9 @@ usr/share/dbus-1/services/org.gtk.GLib.PACRunner.service
%%PORTDOCS%%usr/share/doc/libevdev/COPYING
%%PORTDOCS%%usr/share/doc/libffi/README.md
%%PORTDOCS%%usr/share/doc/libgudev/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/AUTHORS
%%PORTDOCS%%usr/share/doc/libsigsegv/NEWS
%%PORTDOCS%%usr/share/doc/libsigsegv/README
%%PORTDOCS%%usr/share/doc/libverto/AUTHORS
%%PORTDOCS%%usr/share/doc/libverto/ChangeLog
%%PORTDOCS%%usr/share/doc/libverto/NEWS
@ -2650,6 +2659,7 @@ usr/share/licenses/libmount/COPYING
usr/share/licenses/libmount/COPYING.LGPL-2.1-or-later
usr/share/licenses/libselinux/LICENSE
usr/share/licenses/libsepol/LICENSE
usr/share/licenses/libsigsegv/COPYING
usr/share/licenses/libsmartcols/COPYING
usr/share/licenses/libsmartcols/COPYING.LGPL-2.1-or-later
usr/share/licenses/libuuid/COPYING

View file

@ -1,5 +1,6 @@
PORTNAME= discord
DISTVERSION= 0.0.89
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-im
MASTER_SITES= https://dl.discordapp.net/apps/linux/${DISTVERSION}/
@ -22,7 +23,7 @@ RUN_DEPENDS= pulseaudio:audio/pulseaudio
USES= linux:rl9
USE_LINUX= alsa-plugins-oss alsa-plugins-pulseaudio alsalib at-spi2-atk \
atk ca-certificates cups-libs dbuslibs devtools gtk3 jpeg \
libdrm libsigsegv libva nspr nss opus
libdrm libva nspr nss opus
DATADIR= ${PREFIX}/share/${PKGBASE}

View file

@ -1,7 +1,7 @@
PORTNAME= linux-whatsdesk
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.9
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= https://zerkc.gitlab.io/whatsdesk/
DISTFILES= whatsdesk_${DISTVERSION}_amd64.deb
@ -21,7 +21,7 @@ EXTRACT_DEPENDS= deb2targz:archivers/deb2targz
USES= desktop-file-utils linux:rl9 tar:xz
USE_LINUX= alsa-plugins-oss alsa-plugins-pulseaudio alsalib at-spi2-atk \
atk ca-certificates cups-libs dbuslibs devtools gtk3 jpeg libdrm \
libsigsegv nss opus
nss opus
NO_BUILD= yes
SUB_FILES= ${PORTNAME}

View file

@ -1,6 +1,7 @@
PORTNAME= freetube
DISTVERSIONPREFIX= v
DISTVERSION= 0.23.3-beta
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://github.com/FreeTubeApp/FreeTube/releases/download/${DISTVERSIONFULL}/ \
LOCAL/nivit/${PKGNAMEPREFIX}${PORTNAME}/:icons
@ -21,8 +22,7 @@ RUN_DEPENDS= pulseaudio:audio/pulseaudio
USES= linux:rl9 zip
USE_LINUX= alsa-plugins-oss alsa-plugins-pulseaudio alsalib at-spi2-atk \
atk cups-libs dbuslibs devtools gtk3 jpeg libdrm libsigsegv nss \
opus
atk cups-libs dbuslibs devtools gtk3 jpeg libdrm nss opus
DATADIR= ${PREFIX}/share/${PKGBASE}

View file

@ -1,5 +1,6 @@
PORTNAME= vieb
DISTVERSION= 12.2.0
PORTREVISION= 1
CATEGORIES= www linux
MASTER_SITES= https://github.com/Jelmerro/Vieb/releases/download/${DISTVERSION}/ \
LOCAL/nivit/${PORTNAME}/:images
@ -21,7 +22,7 @@ RUN_DEPENDS= pulseaudio:audio/pulseaudio
USES= desktop-file-utils linux:rl9
USE_LINUX= alsa-plugins-oss alsa-plugins-pulseaudio alsalib at-spi2-atk \
atk ca-certificates cups-libs dbuslibs devtools gtk3 jpeg \
libdrm libsigsegv nss opus
libdrm nss opus
DATADIR= ${PREFIX}/share/${PKGBASE}