From 07e6ca1de4a1c94f9d95a57089de8b90f64a829a Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 8 Oct 2021 17:51:42 -0700 Subject: [PATCH 1/2] samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 --- srcpkgs/samba/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 69ac97f71d34..875fd2a4bb8a 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,6 +1,6 @@ # Template file for 'samba' pkgname=samba -version=4.14.7 +version=4.14.8 revision=1 build_style=waf3 build_helper="qemu" @@ -11,7 +11,7 @@ _auth_modules="auth_unix,auth_wbc,auth_server,auth_netlogind,autH_script,auth_sa configure_args="--enable-fhs --sbindir=/usr/bin --localstatedir=/var --sysconfdir=/etc --with-piddir=/run/samba --with-sockets-dir=/run/samba --with-lockdir=/run/lock/samba - --with-privatedir=/etc/samba/private --with-pammodulesdir=/usr/lib/security + --with-pammodulesdir=/usr/lib/security --with-modulesdir=/usr/lib/samba --disable-rpath --disable-rpath-install --without-systemd --without-gettext --bundled-libraries=NONE --with-system-mitkrb5 --without-ad-dc --with-cluster-support @@ -27,10 +27,10 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.samba.org" distfiles="http://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz" -checksum=6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906 +checksum=c936b782c2aced8cd7299c13bec67c495fd4affdb217a6ed6150f4fd6d770fde lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" -make_dirs="/etc/samba/private 0750 root root" +make_dirs="/var/lib/samba/private 0700 root root" subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From d613125ce7897075e6d852fc8c46cc8f1aaf62a3 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 8 Oct 2021 19:01:36 -0700 Subject: [PATCH 2/2] conmon: update to 2.0.30 --- srcpkgs/conmon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template index f79124a91a5f..27852dd99a8e 100644 --- a/srcpkgs/conmon/template +++ b/srcpkgs/conmon/template @@ -1,16 +1,16 @@ # Template file for 'conmon' pkgname=conmon -version=2.0.29 +version=2.0.30 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="libglib-devel" +makedepends="libglib-devel libseccomp-devel" short_desc="OCI container runtime monitor" maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/conmon" distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz" -checksum=eb4d5e157671a61b88786e44094775194e30e1d0ad0b9d50035532ece78dbc28 +checksum=4b0a98fbe8a63c42f60edac25c19aa6606caa7b1e4fe7846fc7f7de0b566ba25 do_install() { vbin bin/conmon