[-- Attachment #1: Type: text/plain, Size: 1657 bytes --] There is a new pull request by CameronNemo against master on the void-packages repository https://github.com/CameronNemo/void-packages samba-privdir-2 https://github.com/void-linux/void-packages/pull/33436 samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/33436.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-samba-privdir-2-33436.patch --] [-- Type: text/x-diff, Size: 1919 bytes --] From d095c17683e5750e5aea85e480c8fd7f182c503d Mon Sep 17 00:00:00 2001 From: Cameron Nemo <cnemo@tutanota.com> Date: Fri, 8 Oct 2021 17:51:42 -0700 Subject: [PATCH] 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 <orphan@voidlinux.org>" 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
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --] There is an updated pull request by CameronNemo against master on the void-packages repository https://github.com/CameronNemo/void-packages samba-privdir-2 https://github.com/void-linux/void-packages/pull/33436 samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/33436.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-samba-privdir-2-33436.patch --] [-- Type: text/x-diff, Size: 1973 bytes --] From 937e565c5946cfa73a079ca8564303986327befa Mon Sep 17 00:00:00 2001 From: Cameron Nemo <cnemo@tutanota.com> Date: Fri, 8 Oct 2021 17:51:42 -0700 Subject: [PATCH] samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 --- srcpkgs/samba/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index ed234d824364..875fd2a4bb8a 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba -version=4.14.7 -revision=2 +version=4.14.8 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -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 <orphan@voidlinux.org>" 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
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --] There is an updated pull request by CameronNemo against master on the void-packages repository https://github.com/CameronNemo/void-packages samba-privdir-2 https://github.com/void-linux/void-packages/pull/33436 samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/33436.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-samba-privdir-2-33436.patch --] [-- Type: text/x-diff, Size: 1973 bytes --] From 756d83e5bb696ff93dcabd0802afa6d2255b497c Mon Sep 17 00:00:00 2001 From: Cameron Nemo <cnemo@tutanota.com> Date: Fri, 8 Oct 2021 17:51:42 -0700 Subject: [PATCH] samba: update to 4.14.8 Also use the default private dir to avoid AppArmor rule violations Fixes #33335 --- srcpkgs/samba/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index ed234d824364..875fd2a4bb8a 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba -version=4.14.7 -revision=2 +version=4.14.8 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -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 <orphan@voidlinux.org>" 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
[-- Attachment #1: Type: text/plain, Size: 257 bytes --] New review comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/33436#discussion_r744187552 Comment: Changing privatedir will break all existing samba installation, since it stores things like user accounts.
[-- Attachment #1: Type: text/plain, Size: 432 bytes --] New comment by ahesford on void-packages repository https://github.com/void-linux/void-packages/pull/33436#issuecomment-1016609675 Comment: If moving `privatedir` breaks current installations, that's bad news. I've merged a competing PR to update to Samba 4.14.11 that doesn't make this change. @CameronNemo, if you think this is still worth pursuing, please rebase and comment. It might be easier to just fix apparmor if needed.
[-- Attachment #1: Type: text/plain, Size: 1490 bytes --] There's a closed pull request on the void-packages repository samba: update to 4.14.8 https://github.com/void-linux/void-packages/pull/33436 Description: Also use the default private dir to avoid AppArmor rule violations Fixes #33335 <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl -->