From 5b4823c7cabe1e3f053355cbc4ab248a3bd7c6bf Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 25 Dec 2022 16:11:13 -0800 Subject: [PATCH 1/3] gcc: disable libssp --- common/shlibs | 1 - srcpkgs/gcc/template | 26 +++++--------------------- srcpkgs/libssp | 1 - srcpkgs/libssp-devel | 1 - 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 120000 srcpkgs/libssp delete mode 120000 srcpkgs/libssp-devel diff --git a/common/shlibs b/common/shlibs index 504d29f4cb989..e01ca41515bd6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1 libppl.so.14 ppl-1.2_1 libppl_c.so.4 ppl-0.11_1 libstdc++.so.6 libstdc++-4.4.0_1 -libssp.so.0 libssp-4.4.0_1 libncurses.so.6 ncurses-libs-6.0_1 ignore libncursesw.so.6 ncurses-libs-5.8_1 ignore libtinfo.so.6 ncurses-libtinfo-libs-6.2_2 diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index a20af7c0ef2e3..7b8bf456ebbae 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -4,7 +4,7 @@ pkgname=gcc version=12.2.0 -revision=1 +revision=2 _minorver="${version%.*}" _majorver="${_minorver%.*}" _gmp_version=6.2.1 @@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff nopie=yes lib32disabled=yes bootstrap=yes -replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0" +replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0 + libssp>=0 libssp-devel>=0" _have_gccgo=yes @@ -54,11 +55,10 @@ else fi makedepends="zlib-devel libzstd-devel" depends="binutils libgcc-devel-${version}_${revision} - libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}" + libstdc++-devel-${version}_${revision}" checkdepends="dejagnu" subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel" -subpackages+=" libssp libssp-devel" build_options="ada gnatboot" build_options_default="ada" @@ -290,6 +290,7 @@ do_configure() { _args+=" --with-linker-hash-style=$_hash" _args+=" --disable-sjlj-exceptions" _args+=" --disable-target-libiberty" + _args+=" --disable-libssp" mkdir -p build cd build @@ -683,23 +684,6 @@ libsanitizer_package() { } } -libssp-devel_package() { - depends="libssp>=${_minorver}" - short_desc+=" - SSP (StackSmashingProtection) library - development files" - pkg_install() { - vmove "usr/lib/libssp*.a" - vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp - } -} - -libssp_package() { - short_desc+=" - SSP (StackSmashingProtection) library" - pkg_install() { - vmove "usr/lib/libssp.so*" - vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION - } -} - libstdc++-devel_package() { depends="libstdc++>=${_minorver}" short_desc+=" - Standard C++ Library - development files" diff --git a/srcpkgs/libssp b/srcpkgs/libssp deleted file mode 120000 index b08d5af5795c6..0000000000000 --- a/srcpkgs/libssp +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel deleted file mode 120000 index b08d5af5795c6..0000000000000 --- a/srcpkgs/libssp-devel +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file From 9abd93701466542cb5df39ad69e4faab3c881414 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 25 Dec 2022 16:12:11 -0800 Subject: [PATCH 2/3] musl: provide libssp_nonshared.a --- srcpkgs/musl/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index afb33cd868b55..1606b50df12b9 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=12 +revision=13 archs="*-musl" bootstrap=yes build_style=gnu-configure @@ -21,6 +21,8 @@ post_build() { $CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent $CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf $CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv + $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o + $AR r libssp_nonshared.a __stack_chk_fail_local.o } do_install() { # Move everything to /usr. @@ -37,6 +39,8 @@ do_install() { vman ${FILESDIR}/getent.1 vbin getconf vman ${FILESDIR}/getconf.1 + # additional symbols from libssp_nonshared (necessary on i386 and PPC) + vinstall libssp_nonshared.a 755 usr/lib # Fake ldconfig ln -s true ${DESTDIR}/usr/bin/ldconfig From 32a6fab34961dbd32011338a0229fd794fcd1e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 12 Feb 2023 10:29:44 +0700 Subject: [PATCH 3/3] *: rebuild for libssp removal --- srcpkgs/AusweisApp2/template | 2 +- srcpkgs/OTPClient/template | 2 +- srcpkgs/avahi-discover/template | 2 +- srcpkgs/bitcoin/template | 2 +- srcpkgs/botan/template | 2 +- srcpkgs/cJSON/template | 2 +- srcpkgs/cups/template | 2 +- srcpkgs/davfs2/template | 2 +- srcpkgs/di/template | 2 +- srcpkgs/dislocker/template | 2 +- srcpkgs/dnsdist/template | 2 +- srcpkgs/dovecot-plugin-pigeonhole/template | 2 +- srcpkgs/dovecot/template | 2 +- srcpkgs/dqlite/template | 2 +- srcpkgs/elogind/template | 2 +- srcpkgs/flac/template | 2 +- srcpkgs/fwknop/template | 2 +- srcpkgs/inkscape/template | 2 +- srcpkgs/keepalived/template | 2 +- srcpkgs/keepassxc/template | 2 +- srcpkgs/kitty/template | 2 +- srcpkgs/kstars/template | 2 +- srcpkgs/libcotp/template | 2 +- srcpkgs/libhtp/template | 2 +- srcpkgs/libknet1/template | 2 +- srcpkgs/linux-tools/template | 2 +- srcpkgs/litecoin/template | 2 +- srcpkgs/lldpd/template | 2 +- srcpkgs/mariadb/template | 2 +- srcpkgs/massdns/template | 2 +- srcpkgs/mksh/template | 2 +- srcpkgs/mkvtoolnix/template | 2 +- srcpkgs/monero-gui/template | 2 +- srcpkgs/monero/template | 2 +- srcpkgs/monit/template | 2 +- srcpkgs/mosh/template | 2 +- srcpkgs/msg2/template | 2 +- srcpkgs/namecoin/template | 2 +- srcpkgs/navit/template | 2 +- srcpkgs/ngircd/template | 2 +- srcpkgs/ntp/template | 2 +- srcpkgs/openjdk8/template | 2 +- srcpkgs/p0f/template | 2 +- srcpkgs/pam_ssh_agent_auth/template | 2 +- srcpkgs/pax/template | 2 +- srcpkgs/powertop/template | 2 +- srcpkgs/qemu/template | 2 +- srcpkgs/qtox/template | 2 +- srcpkgs/raft/template | 2 +- srcpkgs/ruby/template | 2 +- srcpkgs/sox/template | 2 +- srcpkgs/stlink/template | 2 +- srcpkgs/subtle/template | 2 +- srcpkgs/sudo/template | 2 +- srcpkgs/svt-av1/template | 2 +- srcpkgs/tcltls/template | 2 +- srcpkgs/testdisk/template | 2 +- srcpkgs/thc-hydra/template | 2 +- srcpkgs/thunderbird/template | 2 +- srcpkgs/tini/template | 2 +- srcpkgs/tinyssh/template | 2 +- srcpkgs/tor/template | 2 +- srcpkgs/tpm2-tools/template | 2 +- srcpkgs/tpm2-totp/template | 2 +- srcpkgs/tpm2-tss/template | 2 +- srcpkgs/vlc/template | 2 +- srcpkgs/vte3/template | 2 +- srcpkgs/wesnoth/template | 2 +- srcpkgs/xnec2c/template | 2 +- srcpkgs/yubico-piv-tool/template | 2 +- srcpkgs/zmap/template | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template index 066428431b1a4..fcedbd78e6c4c 100644 --- a/srcpkgs/AusweisApp2/template +++ b/srcpkgs/AusweisApp2/template @@ -1,7 +1,7 @@ # Template file for 'AusweisApp2' pkgname=AusweisApp2 version=1.24.1 -revision=1 +revision=2 build_style=cmake build_helper=qemu hostmakedepends="pkg-config qt5-qmake qt5-host-tools" diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template index 409c3942acf60..a5f068ffa9764 100644 --- a/srcpkgs/OTPClient/template +++ b/srcpkgs/OTPClient/template @@ -1,7 +1,7 @@ # Template file for 'OTPClient' pkgname=OTPClient version=2.4.8 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template index 5f6841269c981..6fd6ffc959c00 100644 --- a/srcpkgs/avahi-discover/template +++ b/srcpkgs/avahi-discover/template @@ -5,7 +5,7 @@ # pkgname=avahi-discover version=0.8 -revision=5 +revision=6 build_style=gnu-configure build_helper="gir" configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 478a7a66e8745..83c404962c30e 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=22.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui" diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index e84584086d291..6b381a014d66a 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan version=2.19.3 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="doxygen python3" makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel" diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template index a3f6914ca7dbc..63235062a77cb 100644 --- a/srcpkgs/cJSON/template +++ b/srcpkgs/cJSON/template @@ -1,7 +1,7 @@ # Template file for 'cJSON' pkgname=cJSON version=1.7.15 -revision=1 +revision=2 build_style=cmake short_desc="Ultralightweight JSON parser in ANSI C" maintainer="Orphaned " diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 90e9fdf3f0b13..0d8bc91854562 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,7 +1,7 @@ # Template file for 'cups' pkgname=cups version=2.4.2 -revision=2 +revision=3 build_style=gnu-configure make_install_args="BUILDROOT=${DESTDIR}" hostmakedepends="gnutls-devel pkg-config diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template index 1e62bc8df13de..1a2f8482e210b 100644 --- a/srcpkgs/davfs2/template +++ b/srcpkgs/davfs2/template @@ -1,7 +1,7 @@ # Template file for 'davfs2' pkgname=davfs2 version=1.6.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="dav_user=nobody dav_group=network --enable-largefile" hostmakedepends="automake gettext gettext-devel neon-devel tar" diff --git a/srcpkgs/di/template b/srcpkgs/di/template index 2fdd80a61f605..932444899d52c 100644 --- a/srcpkgs/di/template +++ b/srcpkgs/di/template @@ -1,7 +1,7 @@ # Template file for 'di' pkgname=di version=4.51 -revision=1 +revision=2 build_style=gnu-makefile short_desc="A disk information utility" maintainer="Leah Neukirchen " diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template index a5580034c6fdc..3cfd6162ec928 100644 --- a/srcpkgs/dislocker/template +++ b/srcpkgs/dislocker/template @@ -1,7 +1,7 @@ # Template file for 'dislocker' pkgname=dislocker version=0.7.3 -revision=1 +revision=2 build_style=cmake configure_args="-DLIB_INSTALL_DIR=lib" makedepends="mbedtls-devel fuse-devel" diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template index ae8f79ceb2f9d..6e13f7374891e 100644 --- a/srcpkgs/dnsdist/template +++ b/srcpkgs/dnsdist/template @@ -1,7 +1,7 @@ # Template file for 'dnsdist' pkgname=dnsdist version=1.7.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2 --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2 diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index ac13321e4508f..e4d168cc4f785 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -1,7 +1,7 @@ # Template file for 'dovecot-plugin-pigeonhole' pkgname=dovecot-plugin-pigeonhole version=0.5.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr --with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 45f4104934366..787b29b6eab8d 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -2,7 +2,7 @@ # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot version=2.3.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --disable-static --with-pam --with-mysql --with-pgsql --with-lucene diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index d6f1ed50506de..f4539b9623d98 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,7 +1,7 @@ # Template file for 'dqlite' pkgname=dqlite version=1.13.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="sqlite-devel raft-devel" diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 79186a193f318..73dc786ad70a7 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=246.10 -revision=2 +revision=3 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 2611f41ffb7e8..10aaef2095866 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -1,7 +1,7 @@ # Template file for 'flac' pkgname=flac version=1.3.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests" diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template index 0a795ba08fc91..c297a53304b41 100644 --- a/srcpkgs/fwknop/template +++ b/srcpkgs/fwknop/template @@ -1,7 +1,7 @@ # Template file for 'fwknop' pkgname=fwknop version=2.6.10 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg" hostmakedepends="iptables" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 3d239f62f896e..2e434be00841a 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=6 +revision=7 build_style=cmake # builds executables then runs checks # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index 1d2ef18ca4704..02a463bb7b6bc 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,7 +1,7 @@ # Template file for 'keepalived' pkgname=keepalived version=2.2.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-sha1" hostmakedepends="pkg-config" diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index 863d615b6aa3d..2128f7c2d8126 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,7 +1,7 @@ # Template file for 'keepassxc' pkgname=keepassxc version=2.7.4 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 717f6ca2fda71..90eb7261085c6 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,7 +1,7 @@ # Template file for 'kitty' pkgname=kitty version=0.26.5 -revision=1 +revision=2 pycompile_dirs="usr/lib/kitty" hostmakedepends="pkg-config python3 wayland-devel wayland-protocols" makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template index ebbb3140fcaa0..661cbdcde1701 100644 --- a/srcpkgs/kstars/template +++ b/srcpkgs/kstars/template @@ -1,7 +1,7 @@ # Template file for 'kstars' pkgname=kstars version=3.6.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons kconfig" diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template index b396b0db32024..8a1d6c0cdfca8 100644 --- a/srcpkgs/libcotp/template +++ b/srcpkgs/libcotp/template @@ -1,7 +1,7 @@ # Template file for 'libcotp' pkgname=libcotp version=1.2.8 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="libbaseencode-devel libgcrypt-devel" diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template index 38ceef8b9704c..515fd4dac2a51 100644 --- a/srcpkgs/libhtp/template +++ b/srcpkgs/libhtp/template @@ -1,7 +1,7 @@ # Template file for 'libhtp' pkgname=libhtp version=0.5.36 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" makedepends="zlib-devel" diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template index 6a62a9626faab..4405948d816d9 100644 --- a/srcpkgs/libknet1/template +++ b/srcpkgs/libknet1/template @@ -2,7 +2,7 @@ # only libraries and development files now, if interested in kronosnetd update! pkgname=libknet1 version=1.24 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-dependency-tracking --disable-libknet-sctp --disable-static $(vopt_enable man)" diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 77e4cccaaa33d..baf111b170ec2 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools version=5.10.4 -revision=10 +revision=11 build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3 python3-docutils xmlto" diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 37f3a348d2875..b92b4dc9ad541 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.18.1 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-openssl" diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template index bb103044a0c2e..970c1bc6582e6 100644 --- a/srcpkgs/lldpd/template +++ b/srcpkgs/lldpd/template @@ -1,7 +1,7 @@ # Template file for 'lldpd' pkgname=lldpd version=1.0.11 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-privsep-chroot=/var/empty" hostmakedepends="pkg-config" diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 8d9b0c42edda1..71409f89930c0 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb version=10.5.10 -revision=3 +revision=4 build_style=cmake build_helper=qemu configure_args="-DBUILD_CONFIG=mysql_release diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template index d26c67a19e68e..bc2c9c2c25b6b 100644 --- a/srcpkgs/massdns/template +++ b/srcpkgs/massdns/template @@ -1,7 +1,7 @@ # Template file for 'massdns' pkgname=massdns version=1.0.0 -revision=1 +revision=2 build_style=gnu-makefile short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance" maintainer="Antoine Guilbaud " diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template index c64174cf33d59..1054d41943217 100644 --- a/srcpkgs/mksh/template +++ b/srcpkgs/mksh/template @@ -1,7 +1,7 @@ # Template file for 'mksh' pkgname=mksh version=R59c -revision=1 +revision=2 checkdepends="perl ed" short_desc="MirBSD Korn Shell" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 4ae71a274a97a..b25fe4a20534c 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=73.0.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 03f852bf6f6d0..46668d1a9a853 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.18.1.2 -revision=2 +revision=3 _monero_version=0.18.1.2 # the revision monero uses as a submodule for the specific version _randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 7385c102eda50..311324873e820 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.18.1.2 -revision=2 +revision=3 # the revision monero uses as a submodule for the specific version _randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c" diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index b10596c639d6e..be8e8d95df856 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,7 +1,7 @@ # Template file for 'monit' pkgname=monit version=5.32.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-ssl-dir=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 105cbae7aeade..173ba14bcd477 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.4.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="perl pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel" diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template index 473b3c4ec4d2f..9984cea504eb5 100644 --- a/srcpkgs/msg2/template +++ b/srcpkgs/msg2/template @@ -1,7 +1,7 @@ # Template file for 'msg2' pkgname=msg2 version=1.2.0 -revision=2 +revision=3 build_style=cmake short_desc="Output a blue arrow and a white message on the commandline" maintainer="Orphaned " diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 8af7f49870839..de76d4464b29d 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.18.1 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index 58bc4610f2884..caaa760fa936a 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -1,7 +1,7 @@ # Template file for 'navit' pkgname=navit version=0.5.6 -revision=3 +revision=4 build_style=cmake configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 7634efdfdc20e..1623ac116eca5 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,7 +1,7 @@ # Template file for 'ngircd' pkgname=ngircd version=26 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index fa88f33f92b70..9a1906334682d 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.8p15 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd --enable-all-clocks ol_cv_pthread_select_yields=yes" diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 25a93b300a927..c0b363758db09 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -4,7 +4,7 @@ # TODO: config files? pkgname=openjdk8 version=8u322b04 -revision=3 +revision=4 _jdk_update="${version#*u}" _jdk_update="${_jdk_update%b*}" _jdk_build="${version#*b}" diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template index 26643a09fdb27..1ac9b2f8ea8fa 100644 --- a/srcpkgs/p0f/template +++ b/srcpkgs/p0f/template @@ -1,7 +1,7 @@ # Template file for 'p0f' pkgname=p0f version=3.09b -revision=3 +revision=4 makedepends="libpcap-devel" short_desc="Passive OS fingerprinting tool" maintainer="Orphaned " diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template index 5074482451088..b35511fec684f 100644 --- a/srcpkgs/pam_ssh_agent_auth/template +++ b/srcpkgs/pam_ssh_agent_auth/template @@ -1,7 +1,7 @@ # Template file for 'pam_ssh_agent_auth' pkgname=pam_ssh_agent_auth version=0.10.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-openssl-header-check" hostmakedepends="perl" diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template index bb2913645b6e9..60a00694ef959 100644 --- a/srcpkgs/pax/template +++ b/srcpkgs/pax/template @@ -1,7 +1,7 @@ # Template file for 'pax' pkgname=pax version=20201030 -revision=1 +revision=2 build_wrksrc="${pkgname}" hostmakedepends="cpio" short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)" diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template index 0a7ef1b15fb37..d73055e938a9f 100644 --- a/srcpkgs/powertop/template +++ b/srcpkgs/powertop/template @@ -1,7 +1,7 @@ # Template file for 'powertop' pkgname=powertop version=2.15 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config" makedepends="ncurses-devel pciutils-devel libnl3-devel" diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index b19ccffa0bab9..48ab199e5686b 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -2,7 +2,7 @@ # This package should be updated together with qemu-user-static pkgname=qemu version=7.1.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index b559aea1ec835..16019d7eaec9e 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,7 +1,7 @@ # Template file for 'qtox' pkgname=qtox version=1.17.6 -revision=1 +revision=2 build_style=cmake configure_args="-DUPDATE_CHECK=OFF -DGIT_DESCRIBE=${version} diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template index 39cd14ecf3e85..234a5a6da37f9 100644 --- a/srcpkgs/raft/template +++ b/srcpkgs/raft/template @@ -1,7 +1,7 @@ # Template file for 'raft' pkgname=raft version=0.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-example=no" hostmakedepends="pkg-config autoconf automake libtool" diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index a2b2684db3ca4..c071d2c25bffb 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -3,7 +3,7 @@ _ruby_abiver=3.1.0 pkgname=ruby version=3.1.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-shared --disable-rpath PKG_CONFIG=/usr/bin/pkg-config" diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template index 1f5f8a43da090..89cf177771ca2 100644 --- a/srcpkgs/sox/template +++ b/srcpkgs/sox/template @@ -1,7 +1,7 @@ # Template file for 'sox' pkgname=sox version=14.4.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-distro=Void" hostmakedepends="pkg-config" diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template index 44788bd15f254..db3e75ed2b1cb 100644 --- a/srcpkgs/stlink/template +++ b/srcpkgs/stlink/template @@ -1,7 +1,7 @@ # Template file for 'stlink' pkgname=stlink version=1.7.0 -revision=1 +revision=2 build_style=cmake configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d -DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib" diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template index a60bd06c540c9..1f41155a11ad4 100644 --- a/srcpkgs/subtle/template +++ b/srcpkgs/subtle/template @@ -1,7 +1,7 @@ # Template file for 'subtle' pkgname=subtle version=0.11.6579 -revision=3 +revision=4 hostmakedepends="python3 mercurial ruby-devel pkg-config" makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel libXinerama-devel libXrandr-devel libXtst-devel" diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 6de8fe42b4082..f1278024f4ff8 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -1,7 +1,7 @@ # Template file for 'sudo' pkgname=sudo version=1.9.12p2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor --enable-shell-sets-home --enable-noargs-shell --without-sendmail diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template index f51642d31f185..3ca728ac94c80 100644 --- a/srcpkgs/svt-av1/template +++ b/srcpkgs/svt-av1/template @@ -1,7 +1,7 @@ # Template file for 'svt-av1' pkgname=svt-av1 version=1.4.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="nasm" short_desc="AV1-compliant encoder/decoder library core" diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template index ffd98107f7065..7f02d2e810f30 100644 --- a/srcpkgs/tcltls/template +++ b/srcpkgs/tcltls/template @@ -1,7 +1,7 @@ # Template file for 'tcltls' pkgname=tcltls version=1.7.22 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="pkg-config" diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template index 556cb92210ddd..3da8fe017d465 100644 --- a/srcpkgs/testdisk/template +++ b/srcpkgs/testdisk/template @@ -1,7 +1,7 @@ # Template file for 'testdisk' pkgname=testdisk version=7.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-ewf --enable-sudo" makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template index 40ade86edbcc5..db7d539298153 100644 --- a/srcpkgs/thc-hydra/template +++ b/srcpkgs/thc-hydra/template @@ -1,7 +1,7 @@ # Template file for 'thc-hydra' pkgname=thc-hydra version=9.1 -revision=4 +revision=5 build_style=gnu-configure make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra" makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index d1b1a1c1f9098..84b53fb8fe1fe 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -4,7 +4,7 @@ # pkgname=thunderbird version=102.6.1 -revision=1 +revision=2 build_helper="rust" short_desc="Standalone Mail/News reader" maintainer="Érico Nogueira " diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template index fb18b07ba3f24..78ed8c565e144 100644 --- a/srcpkgs/tini/template +++ b/srcpkgs/tini/template @@ -1,7 +1,7 @@ # Template file for 'tini' pkgname=tini version=0.19.0 -revision=1 +revision=2 build_style=cmake short_desc="Tiny but valid init for containers" maintainer="PWA COLLECTIVE " diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template index 65e4ec6e7b8b3..c65bd2b6afe35 100644 --- a/srcpkgs/tinyssh/template +++ b/srcpkgs/tinyssh/template @@ -1,7 +1,7 @@ # Template file for 'tinyssh' pkgname=tinyssh version=20220801 -revision=1 +revision=2 build_style=gnu-makefile make_dirs="/etc/tinyssh 0755 root root" depends="ucspi-tcp" diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 1a656a99cb56c..06b3879fd2f95 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,7 +1,7 @@ # Template file for 'tor' pkgname=tor version=0.4.7.13 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-zstd" hostmakedepends="pkg-config" diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template index 258495e196f04..0bd3d595a3970 100644 --- a/srcpkgs/tpm2-tools/template +++ b/srcpkgs/tpm2-tools/template @@ -1,7 +1,7 @@ # Template file for 'tpm2-tools' pkgname=tpm2-tools version=5.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)" makedepends="libcurl-devel openssl-devel tpm2-tss-devel" diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template index ebdf3f359c302..4bf31a0c6469b 100644 --- a/srcpkgs/tpm2-totp/template +++ b/srcpkgs/tpm2-totp/template @@ -1,7 +1,7 @@ # Template file for 'tpm2-totp' pkgname=tpm2-totp version=0.3.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)" makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel" diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template index ddf3c7ce4a9a5..9eb22b07ecaac 100644 --- a/srcpkgs/tpm2-tss/template +++ b/srcpkgs/tpm2-tss/template @@ -1,7 +1,7 @@ # Template file for 'tpm2-tss' pkgname=tpm2-tss version=3.2.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi" hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 25867af434409..210762b0a7e29 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.18 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 01229a0c7dd15..29f4bd6a95948 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,7 +1,7 @@ # Template file for 'vte3' pkgname=vte3 version=0.70.1 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index dcc524fa68607..9b03976475699 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.16.6 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template index 3943bf196dfca..67c9842aceee6 100644 --- a/srcpkgs/xnec2c/template +++ b/srcpkgs/xnec2c/template @@ -1,7 +1,7 @@ # Template file for 'xnec2c' pkgname=xnec2c version=4.4.12 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which" makedepends="gtk+3-devel" diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template index 432dba7500338..01dea35110262 100644 --- a/srcpkgs/yubico-piv-tool/template +++ b/srcpkgs/yubico-piv-tool/template @@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library" pkgname=yubico-piv-tool version=2.3.0 -revision=1 +revision=2 build_style=cmake configure_args="-DGENERATE_MAN_PAGES=OFF" hostmakedepends="automake libtool gengetopt pkg-config perl" diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template index b35b850480e96..23d693a0feb13 100644 --- a/srcpkgs/zmap/template +++ b/srcpkgs/zmap/template @@ -1,7 +1,7 @@ # Template file for 'zmap' pkgname=zmap version=2.1.1 -revision=5 +revision=6 build_style=cmake conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf" hostmakedepends="flex byacc gengetopt pkg-config"