From 6abc000ca7c0813d974544f1df4cde7c9806e807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:07 -0300 Subject: [PATCH 01/10] skalibs: update to 2.9.3.0, remove noarch. --- srcpkgs/skalibs/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 7b838abda1b..f8e5b43977c 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.9.2.1 +version=2.9.3.0 revision=1 _sysdepspkg=skaware-void-sysdeps build_style=configure @@ -15,14 +15,13 @@ license="ISC" homepage="https://skarnet.org/software/skalibs/" changelog="https://skarnet.org/software/skalibs/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=250b99b53dd413172db944b31c1b930aa145ac79fe6c5d7e6869ef804228c539 +checksum=f01a07049d384097864410f9251447ad899db0d17f82cd8ebc6b7000d7783b44 post_install() { vlicense COPYING LICENSE } skalibs-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 03b065ddbbc16772d32f3e76119f8f8777e75fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:05 -0300 Subject: [PATCH 02/10] nsss: fix musl-devel conflict, add checkdeps. grp.h was being installed into /usr/include. Make nsss-devel depend on nsss, and remove nsss dependency from nsss-doc. Also remove noarch. --- srcpkgs/nsss/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template index 947efc1a496..d502664f0e2 100644 --- a/srcpkgs/nsss/template +++ b/srcpkgs/nsss/template @@ -1,14 +1,15 @@ # Template file for 'nsss' pkgname=nsss version=0.0.2.2 -revision=1 +revision=2 # Only available for musl archs="*-musl" build_style=configure configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps --with-lib=${XBPS_CROSS_BASE}/usr/lib --enable-shared --libdir=/usr/lib - --bindir=/usr/bin --dynlibdir=/usr/lib" + --bindir=/usr/bin --dynlibdir=/usr/lib --includedir=/usr/include/nsss" makedepends="skalibs-devel" +checkdepends="s6" short_desc="Minimal competing implementation of glibc's Name Switch Service" maintainer="Orphaned " license="ISC" @@ -24,9 +25,7 @@ post_install() { } nsss-doc_package() { - archs=noarch short_desc+=" - documentation" - depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/share/doc } @@ -34,6 +33,7 @@ nsss-doc_package() { nsss-devel_package() { short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove "usr/lib/*.a" From d4adc79f9c4e3566d8797c1cc7fe3a54e0775dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:05 -0300 Subject: [PATCH 03/10] execline: update to 2.6.1.1, remove noarch. Update for nsss headers location. --- srcpkgs/execline/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index ad3b509a2f1..71280116e88 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.6.1.0 +version=2.6.1.1 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -13,7 +13,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=a24c76f097ff44fe50b63b89bcde5d6ba9a481aecddbe88ee01b0e5a7b314556 +checksum=394308f0349f962086a9695ca2bb5ef32cd38e5be6b7cec0b3d0cf35a2b2ba56 CFLAGS="-fPIC" @@ -25,7 +25,10 @@ if [ "$build_option_static" ]; then fi case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -35,7 +38,6 @@ post_install() { } execline-doc_package() { - archs=noarch short_desc+=" - Documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 043450ba8308658211622a63e2f89adc12f2c7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 04/10] s6: remove noarch. Update for nsss headers location. --- srcpkgs/s6/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index c23c02e4f33..da6adbf9015 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,7 +1,7 @@ # Template file for 's6' pkgname=s6 version=2.9.2.0 -revision=1 +revision=2 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps @@ -17,7 +17,10 @@ distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz" checksum=363db72af8fffba764b775c872b0749d052805b893b07888168f59a841e9dddd case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -27,7 +30,6 @@ post_install() { } s6-doc_package() { - archs=noarch short_desc="Documentation for s6" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 5c41bbf376597287b21258d12c5706373489eba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 05/10] s6-rc: update to 0.5.2.0, remove noarch. --- srcpkgs/s6-rc/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template index 4296af454a2..23744d4df96 100644 --- a/srcpkgs/s6-rc/template +++ b/srcpkgs/s6-rc/template @@ -1,6 +1,6 @@ # Template file for 's6-rc' pkgname=s6-rc -version=0.5.1.4 +version=0.5.2.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-rc/" changelog="https://skarnet.org/software/s6-rc/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=af69a47fbb6aa513ee9e4154b891fd7f8cd7b8c7a76d4311d84156cd6f8f001f +checksum=1ab21a9bdde61b50e3d9deab867e01f808064dce653b0ebf8e5f5125d57cfee2 post_install() { vlicense COPYING @@ -34,7 +34,6 @@ s6-rc-devel_package() { } s6-rc-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 6c5b0d77a07bcf9e0707665110de03c8b2bb0732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 06/10] s6-dns: update to 2.3.3.0, remove noarch. --- srcpkgs/s6-dns/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index 9a0227f2806..c192e6286a2 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -1,6 +1,6 @@ # Template file for 's6-dns' pkgname=s6-dns -version=2.3.2.0 +version=2.3.3.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib @@ -10,9 +10,9 @@ makedepends="execline-devel skalibs-devel" short_desc="Suite of DNS client programs and libraries for Unix systems" maintainer="lemmi " license="ISC" -homepage="https://skarnet.org/software/${pkgname}/" -distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=27b6129eaaea31ab907eea8a52369fe864ba7984c8f3e33dc098beb47b581e26 +homepage="https://skarnet.org/software/s6-dns" +distfiles="${homepage}/${pkgname}-${version}.tar.gz" +checksum=2ac75918ff5eb4d6dabe33f7e55fa70cf3e6a9062ff87de5a35029ea22238716 post_install() { vlicense COPYING @@ -21,7 +21,6 @@ post_install() { } s6-dns-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 793049997dc83ece771a6d04d2e5a62d65a55b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 07/10] s6-networking: update to 2.3.2.0, remove noarch. Update for nsss headers location. --- srcpkgs/s6-networking/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 50ff6abbc1f..e53eca35a33 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,7 +1,7 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.3.1.2 -revision=3 +version=2.3.2.0 +revision=1 build_style=configure configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl) $(vopt_if bearssl --enable-ssl=bearssl) @@ -15,7 +15,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-networking" changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=d953dbfdf9020bb27e873328df1b644f8a7b6a3972a4288b1f20edeaf85b4980 +checksum=bbe36a8460d90f3bff56c934811876186f7224ced5bdc15c2c96d49b4e917d12 build_options="bearssl libressl" build_options_default="libressl" @@ -24,7 +24,10 @@ desc_option_libressl="Use LibreSSL as SSL library" vopt_conflict bearssl libressl case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -34,7 +37,6 @@ post_install() { } s6-networking-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 61ac58f5856a3283a5a87a35cda1f374c5af9baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 08/10] s6-linux-utils: update to 2.5.1.3, remove noarch. Update for nsss headers location. --- srcpkgs/s6-linux-utils/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template index 224125b1117..9e4cf9d4ff7 100644 --- a/srcpkgs/s6-linux-utils/template +++ b/srcpkgs/s6-linux-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-linux-utils' pkgname=s6-linux-utils -version=2.5.1.2 +version=2.5.1.3 revision=1 build_style=configure configure_args="--libdir=/usr/lib --includedir=/usr/include @@ -10,13 +10,16 @@ makedepends="skalibs-devel" short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)" maintainer="mobinmob " license="ISC" -homepage="https://skarnet.org/software/${pkgname}/" +homepage="https://skarnet.org/software/s6-linux-utils" changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html" -distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=06f97b84e78abcc952d108c0bab28831676062fe6f34cf7eeab32c8f93ae9270 +distfiles="${homepage}/${pkgname}-${version}.tar.gz" +checksum=4471511c9ce995c5ac61e0714def5a05fcabe730ef0bb93a42b12ad5bf007b71 case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -26,7 +29,6 @@ post_install() { } s6-linux-utils-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From df71f536be47b82d7ffb1a4df3dad71b35f9160d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:06 -0300 Subject: [PATCH 09/10] s6-portable-utils: update to 2.2.3.0, remove noarch. --- srcpkgs/s6-portable-utils/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template index c163ea31eae..c0e19c6085a 100644 --- a/srcpkgs/s6-portable-utils/template +++ b/srcpkgs/s6-portable-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-portable-utils' pkgname=s6-portable-utils -version=2.2.2.4 +version=2.2.3.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include @@ -13,7 +13,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-portable-utils/" changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=07c7481e06162cc8d13bad5a67dde8a3adb0cb25148ed865ade4bd2b0963abdd +checksum=29baab7ca8d5c97cb5f311f4ad359ecee4ed13249fb51e351f4bbc175de47f18 post_install() { vlicense COPYING @@ -22,7 +22,6 @@ post_install() { } s6-portable-utils-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { From 1b024689c0188c3b4b744f3d8d0bd680b2ec468f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 30 Sep 2020 00:11:05 -0300 Subject: [PATCH 10/10] mdevd: update to 0.1.2.0, remove noarch. Update for nsss headers location. --- srcpkgs/mdevd/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template index 4dc0d6e1f64..a5c97a0dffa 100644 --- a/srcpkgs/mdevd/template +++ b/srcpkgs/mdevd/template @@ -1,6 +1,6 @@ # Template file for 'mdevd' pkgname=mdevd -version=0.1.1.2 +version=0.1.2.0 revision=1 build_style=configure configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib @@ -13,10 +13,13 @@ 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=c926b6f9f9f48a73733397f08b6c299a8a2f0eff3d729de7f9d0a763757dab2a +checksum=952af443bc61b3694432f7799ba8182824083726872f47f45467c1a5b24796c1 case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;; + *-musl) + makedepends+=" nsss-devel" + configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss" + ;; esac post_install() { @@ -26,7 +29,6 @@ post_install() { } mdevd-doc_package() { - archs=noarch short_desc+=" - documentation" depends="${sourcepkg}>=${version}_${revision}" pkg_install() {