From c45974d0a32498810f305cb26746f45045b38008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oever=20Gonz=C3=A1lez?= Date: Sat, 31 Aug 2019 23:02:04 -0600 Subject: [PATCH 1/2] samba4: remove double quotes for renice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The double quote thells the shell that the list returned from `pidof` is a single argument, therefore, `renice` will cry about a malformed input. With this commit, `renice` will be applied correctly to all the returned PIDs from `pidof`. The output of `renice` for the quoted list is as follows: `renice: invalid number '6592 6587 6586 6574'` `renice` does not show and does apply the nice value if the list is unquoted. Signed-off-by: Oever González Signed-off-by: Jan Pavlinec --- net/samba4/files/samba.init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init index d7eed562a..39686e6cd 100644 --- a/net/samba4/files/samba.init +++ b/net/samba4/files/samba.init @@ -211,9 +211,9 @@ start_service() { fi # lower priority using renice (if found) if [ -x /usr/bin/renice ]; then - [ -x /usr/sbin/samba ] && renice -n 2 "$(pidof samba)" - [ -x /usr/sbin/smbd ] && renice -n 2 "$(pidof smbd)" - [ -x /usr/sbin/nmbd ] && renice -n 2 "$(pidof nmbd)" - [ -x /usr/sbin/winbindd ] && renice -n 2 "$(pidof winbindd)" + [ -x /usr/sbin/samba ] && renice -n 2 $(pidof samba) + [ -x /usr/sbin/smbd ] && renice -n 2 $(pidof smbd) + [ -x /usr/sbin/nmbd ] && renice -n 2 $(pidof nmbd) + [ -x /usr/sbin/winbindd ] && renice -n 2 $(pidof winbindd) fi } From ad16f2a851aeab46856bbf812e7794cbcecf1a69 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Wed, 4 Sep 2019 12:58:06 +0200 Subject: [PATCH 2/2] samba4: update to version 4.9.13 (security fix) Fixes CVE-2019-10197 Signed-off-by: Jan Pavlinec --- net/samba4/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 5e416fab8..bb5841e30 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba -PKG_VERSION:=4.9.11 -PKG_RELEASE:=3 +PKG_VERSION:=4.9.13 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \ @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \ http://www.nic.funet.fi/index/samba/pub/samba/stable/ \ http://samba.mirror.bit.nl/samba/ftp/stable/ \ https://download.samba.org/pub/samba/stable/ -PKG_HASH:=bb736624d16f7369e395de2f15fec153b554f76f95864015b4ce1f2ae53e817b +PKG_HASH:=ab18331e37766b13dbb07d1f115bda3d794917baf502d0ca2b2b8fff014b88f2 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-3.0-only