Skip to content
Merged

s6 #56508

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -2535,7 +2535,9 @@ libgnunettransport.so.2 gnunet-0.12.2_1
libgnunettransportapplication.so.0 gnunet-0.12.2_1
libgnunettransportcore.so.0 gnunet-0.12.2_1
libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
libskarnet.so.2.13 skalibs-2.13.0.0_1
libskarnet.so.2.14 skalibs-2.14.0.0_1
libskarnet.so.2.14 skalibs-2.14.4.0_1
libKF6BalooWidgets.so.6 baloo-widgets-24.02.0_1
libtidy.so.58 libtidy5-5.8.0_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
libinjeqt.so.1 injeqt-1.1.0_1
Expand Down Expand Up @@ -3730,7 +3732,7 @@ libltc.so.11 libltc-1.3.1_1
libvpd-2.2.so.2 libvpd-2.2.6_1
libvpd_cxx-2.2.so.2 libvpd-2.2.6_1
liblcf.so.0 liblcf-0.6.0_1
liboblibs.so.0.1 oblibs-0.1.1.1_1
liboblibs.so.0.3 oblibs-0.3.4.0_1
libaal-1.0.so.7 libaal-1.0.7_1
libaal-minimal.so.0 libaal-1.0.7_1
libcli.so.1.10 libcli-1.10.7_1
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/66-init
10 changes: 5 additions & 5 deletions srcpkgs/66-tools/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for '66-tools'
pkgname=66-tools
version=0.0.8.0
revision=3
version=0.1.2.0
revision=1
build_style=configure
configure_args="--prefix=/usr
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
Expand All @@ -13,9 +13,9 @@ short_desc="Small tools and helpers for service scripts execution"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="http://web.obarun.org/software/index.html"
changelog="https://framagit.org/Obarun/66-tools/-/raw/master/doc/upgrade.md"
distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
checksum=58f072ce1bbc6b6440046d3dc860ca31bb3f39801d09853141006dd5f7041dbb
changelog="https://git.obarun.org/Obarun/66-tools/-/raw/master/doc/upgrade.md"
distfiles="https://git.obarun.org/Obarun/66-tools/-/archive/${version}/66-tools-${version}.tar.gz"
checksum=5e30933e02a74398df3810bdcaf70170e91322e2ff2165d79d568001e321db88

post_install() {
vlicense LICENSE
Expand Down
5 changes: 0 additions & 5 deletions srcpkgs/66/INSTALL.msg

This file was deleted.

27 changes: 0 additions & 27 deletions srcpkgs/66/patches/shutdown_posixsh.diff

This file was deleted.

43 changes: 23 additions & 20 deletions srcpkgs/66/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for '66'
pkgname=66
version=0.6.2.0
revision=4
version=0.8.2.1
revision=1
build_style=configure
configure_args="--prefix=/usr
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
Expand All @@ -10,35 +10,38 @@ configure_args="--prefix=/usr
--with-s6-log-user=_s6log
--with-system-dir=/etc/66/lib"
hostmakedepends="pkg-config lowdown"
makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel"
depends="s6-rc"
makedepends="oblibs-devel skalibs-devel execline-devel s6-devel"
depends="s6"
short_desc="Small tools built around s6 and s6-rc programs"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="http://web.obarun.org/software/"
changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/upgrade.md"
distfiles="https://git.obarun.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
checksum=f63600e9f8e53211e421707aae7f98d2fa9d1b0d0b4b39162cf180df12b99c28
patch_args="-Np1"

conf_files="/etc/66/init.conf"

system_accounts="_s6log"

make_dirs="/var/log/66 0750 _s6log _s6log"

pre_configure() {

# Clean the default $PATH for service scripts
vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
"${wrksrc}/skel/init.conf"
changelog="https://git.obarun.org/Obarun/66/-/raw/master/doc/66-upgrade.md"
distfiles="https://git.obarun.org/Obarun/66/-/archive/${version}/66-${version}.tar.bz2"
checksum=89e45665e44e0d20d623283448ed52cd1377ce04e84081a6a831b36ac5a18d51

pre_check() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
ln -sv $wrksrc/lib66.so.xyzzy $wrksrc/lib66.so.0.8
fi
}

post_install() {
mv "${PKGDESTDIR}/usr/bin/init" "${PKGDESTDIR}/usr/bin/66-init"
vdoc README.md
vlicense LICENSE
}

66-init_package() {
short_desc+=" - init system"
depends="${sourcepkg}-${version}_${revision}"
conflicts="s6-linux-init s6-rc runit-void"
pkg_install() {
vmove usr/bin/66-init
vmove etc/66
}
}

66-doc_package() {
short_desc+=" - documentation"
depends="${sourcepkg}-${version}_${revision}"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/execline/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'execline'
pkgname=execline
version=2.9.2.0
version=2.9.7.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
Expand All @@ -15,7 +15,7 @@ license="ISC"
homepage="https://skarnet.org/software/execline/"
changelog="https://skarnet.org/software/execline/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=9365012558a1e3c019cafc6eb574b0f5890495fb02652f20efdd782d577b1601
checksum=73c9160efc994078d8ea5480f9161bfd1b3cf0b61f7faab704ab1898517d0207

CFLAGS="-fPIC"

Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/mdevd/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'mdevd'
pkgname=mdevd
version=0.1.6.2
version=0.1.7.0
revision=1
build_style=configure
configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
Expand All @@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/mdevd/"
changelog="https://skarnet.org/software/mdevd/upgrade.html"
distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
checksum=ac2fcf9004f07904592c5894e2c401e15bb027ecf37bcb8ea661e2a7993447be
checksum=ec966eec39879f33c785343373021c44f887c836a08fcaf1d63412e3bdbfca32

build_options="static"
desc_option_static="Build static binaries"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/nsss/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'nsss'
pkgname=nsss
version=0.2.0.3
version=0.2.1.0
revision=1
# Only available for musl
archs="*-musl"
Expand All @@ -16,7 +16,7 @@ license="ISC"
homepage="https://skarnet.org/software/nsss/"
changelog="https://skarnet.org/software/nsss/upgrade.html"
distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
checksum=b1e397ed5b327611a7c2c8c1dc60e91fef353c54fead464f887720bc0914148e
checksum=f221a31c1cee881e992a86dfe296332253c7a9fc65f60d88829cc8e8948420f4

build_options="static"

Expand Down
22 changes: 14 additions & 8 deletions srcpkgs/oblibs/template
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
# Template file for 'oblibs'
pkgname=oblibs
version=0.1.4.0
revision=3
version=0.3.4.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
makedepends="skalibs-devel execline-devel"
short_desc="Obarun library"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://framagit.org/Obarun/oblibs"
distfiles="https://framagit.org/Obarun/oblibs/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
checksum=0ebb6024b9b2c737b0e065e2d49a98965db116c04caff4289acde332316b781a
homepage="https://git.obarun.org/Obarun/oblibs"
changelog="https://git.obarun.org/Obarun/oblibs/-/raw/master/doc/upgrade.md"
distfiles="https://git.obarun.org/Obarun/oblibs/-/archive/${version}/oblibs-${version}.tar.bz2"
checksum=aa85916444474fab7fa9f21def8a73b73223fd2f4017d232d5e388142371d7b9

pre_check() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
ln -sv $wrksrc/liboblibs.so.xyzzy $wrksrc/liboblibs.so.0.3
fi
}

post_install() {
vlicense LICENSE
Expand All @@ -20,8 +27,7 @@ oblibs-devel_package() {
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.a"
vmove usr/include/oblibs
vmove "usr/lib/*.so"
vmove usr/lib/*.so
vmove usr/include/oblibs/*
}
}
8 changes: 4 additions & 4 deletions srcpkgs/s6-dns/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 's6-dns'
pkgname=s6-dns
version=2.3.5.5
version=2.4.1.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib
Expand All @@ -9,11 +9,11 @@ configure_args="--prefix=/usr --libdir=/usr/lib
$(vopt_if static --enable-static-libc)"
makedepends="execline-devel skalibs-devel"
short_desc="Suite of DNS client programs and libraries for Unix systems"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="Komeil Parseh <komeilparseh@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-dns"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
checksum=56979b5d5125c38071a80b5e3df0d4a6b2a7c52bb863a2410b6e3d797ffe1ee8
distfiles="https://skarnet.org/software/s6-dns/s6-dns-${version}.tar.gz"
checksum=b6308519f109a67469c4aaafa9df1f009ad0961fa798ffc38f895587e6935729

build_options="static"

Expand Down
1 change: 1 addition & 0 deletions srcpkgs/s6-linux-init-doc
11 changes: 11 additions & 0 deletions srcpkgs/s6-linux-init-man-pages/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Template file for 's6-linux-init-man-pages'
pkgname=s6-linux-init-man-pages
version=1.1.2.0.1
revision=1
build_style=gnu-makefile
short_desc="Ports of the HTML documentation for the s6-linux-init to mdoc(7)"
maintainer="Komeil Parseh <komeilparseh@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://git.sr.ht/~flexibeast/s6-linux-init-man-pages"
distfiles="https://git.sr.ht/~flexibeast/s6-linux-init-man-pages/archive/v${version}.tar.gz"
checksum=be552ce7aa45ce5849e4f3437da1a5c42602cc9c8c6f40ca5bd3c510cb7ffbf9
46 changes: 46 additions & 0 deletions srcpkgs/s6-linux-init/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Template file for 's6-linux-init'
pkgname=s6-linux-init
version=1.1.3.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
--with-lib=${XBPS_CROSS_BASE}/usr/lib
$(vopt_if static --enable-static-libc)"
makedepends="s6-devel skalibs-devel execline-devel"
depends="s6"
short_desc="Set of minimalistic tools used to create a s6-based init system"
maintainer="Komeil Parseh <komeilparseh@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-linux-init/"
changelog="https://skarnet.org/software/s6-linux-init/upgrade.html/"
distfiles="https://skarnet.org/software/s6-linux-init/s6-linux-init-${version}.tar.gz"
checksum=d11b596b719ac134f77eb19450907d1fe6d84b4adc36d44ef748dbe55487b3ed

conflicts="66-init runit-void"

build_options="static"
desc_option_static="Build static binaries"

case "$XBPS_TARGET_MACHINE" in
*-musl)
makedepends+=" nsss-devel"
configure_args+=" --with-include=${XBPS_CROSS_BASE}/usr/include/nsss"
;;
esac

post_install() {
mv -v ${PKGDESTDIR}/usr/etc ${PKGDESTDIR}/etc

vlicense COPYING
vdoc README
vcopy "doc/*" usr/share/doc/${pkgname}
}

s6-linux-init-doc_package() {
short_desc="Documentation for s6"
depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-man-pages"
pkg_install() {
vmove usr/share/doc
}
}
4 changes: 2 additions & 2 deletions srcpkgs/s6-linux-utils/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 's6-linux-utils'
pkgname=s6-linux-utils
version=2.6.1.0
version=2.6.3.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --includedir=/usr/include
Expand All @@ -15,7 +15,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-linux-utils"
changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
checksum=2accb5a443dd04203a6358534bdcf0dd369aceb4733e322612c2b8329260b7a2
checksum=7e249c36c73b99ebfc1f9a9a4c318be76b461ebc53d3952de9064ccfab400739

build_options="static multicall"
desc_option_static="Build static binaries"
Expand Down
8 changes: 4 additions & 4 deletions srcpkgs/s6-man-pages/template
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Template file for 's6-man-pages'
pkgname=s6-man-pages
version=2.11.3.0.1
version=2.13.1.0.1
revision=1
build_style=gnu-makefile
short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-man-pages"
distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
checksum=223e7c843e3996338efe1aee8d2779ae5b4b30e9140fd625021dda5c403b88be
homepage="https://git.sr.ht/~flexibeast/s6-man-pages"
distfiles="https://git.sr.ht/~flexibeast/s6-man-pages/archive/v${version}.tar.gz"
checksum=e1a9e002506f4f1806d278211168b9408e83e15899f925ad68e23aca6e6c33a4

post_install() {
vlicense LICENSE
Expand Down
8 changes: 4 additions & 4 deletions srcpkgs/s6-networking-man-pages/template
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Template file for 's6-networking-man-pages'
pkgname=s6-networking-man-pages
version=2.5.1.3.1
version=2.7.0.4.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
short_desc="Mdoc versions of the documentation for the s6-networking suite"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-networking-man-pages"
distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz"
checksum=6cff17453dc7946a2a5b94b8a4a48965db6c52c6000420acaedd443f9d069e8f
homepage="https://git.sr.ht/~flexibeast/s6-networking-man-pages"
distfiles="https://git.sr.ht/~flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
checksum=3a80b9474b5111552264511a6fea247e524235b8207f5d747acf976757e22404

post_install() {
vlicense LICENSE
Expand Down
Loading