commit 4313f155a67506acf3df276028b4bac13cf2f1d8 Author: Juergen Daubert <jue@jue.li> Date: Tue Oct 25 18:34:52 2022 +0200 [notify] samba: update to 4.17.2, security fixes for CVE-2022-3437 and CVE-2022-3592 diff --git a/samba/.footprint b/samba/.footprint index fd54a985a..944af13fc 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -1,4 +1,6 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/pam.d/ +-rw-r--r-- root/root etc/pam.d/samba drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/samba drwxr-xr-x root/root etc/revdep.d/ diff --git a/samba/.signature b/samba/.signature index a22ebe12c..6f485022f 100644 --- a/samba/.signature +++ b/samba/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QGcyAU62/4o5TnbNHftK6hyUb9bbZwVLmgcuvJJfHYwrMv9rNArjB40R0exDDl7fZVT1pfOOeYDT1QGqVv8EgM= -SHA256 (Pkgfile) = db72471b11504dd7743e02f702348303311c2c3d4c5447b939d7738a5ceacc15 -SHA256 (.footprint) = a7bae7d56af825dc59c93c86aac90a8d2251d72509adf88c6c65c029e7f18116 -SHA256 (samba-4.17.1.tar.gz) = 1b939d03f8ca57194c413ed863014a3850c9ce9f9e31c2a7df706806fba77c01 -SHA256 (samba) = 0ab5a29dd85d5107cea902c21dd8426d20c3bcb2ce28a5add10d572bb88adc63 +RWSE3ohX2g5d/XmtsimeGXY34TtE1punvz9S4yrUA0ZTM8Itihf6L+c7zbRg6R4mq4Sc/NLepKXg4JH4s24DLWw2/b0ZYznbBwM= +SHA256 (Pkgfile) = 5590c8573cc16f2f89be0011f4f900b2d8943736a597243c9687644205c88865 +SHA256 (.footprint) = dc548cc5bf722865678b4cd124a95b233fd0f4518894fb060afba3a8b8b08767 +SHA256 (samba-4.17.2.tar.gz) = e55ddf4d5178f8c84316abf53c5edd7b35399e3b7d86bcb81b75261c827bb3b8 +SHA256 (samba.rc) = 0ab5a29dd85d5107cea902c21dd8426d20c3bcb2ce28a5add10d572bb88adc63 +SHA256 (samba.pam) = c872a9efb2f7151e51e10fada4a75d69f5f5bd5afb1db29b64e8288c7cdc8b20 diff --git a/samba/Pkgfile b/samba/Pkgfile index fa51a627a..f3041b2fd 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,10 +4,10 @@ # Depends on: dbus gnutls ldb libarchive linux-pam gnutls jansson p5-json p5-parse-yapp popt python3 rpcsvc-proto tdb tevent name=samba -version=4.17.1 +version=4.17.2 release=1 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ - samba) + samba.rc samba.pam) build () { cd $name-$version @@ -39,9 +39,10 @@ build () { rm -r $PKG/run # config-file and start-script - install -d $PKG/etc/{samba,rc.d} + install -d $PKG/etc/{samba,rc.d,pam.d} install -m 0600 examples/smb.conf.default $PKG/etc/samba - install -m 0755 $SRC/samba $PKG/etc/rc.d + install -m 0755 $SRC/samba.rc $PKG/etc/rc.d/samba + install -m 0644 $SRC/samba.pam $PKG/etc/pam.d/samba # revdep install -d $PKG/etc/revdep.d diff --git a/samba/samba b/samba/samba deleted file mode 100644 index 611d9e5bf..000000000 --- a/samba/samba +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/samba: start/stop samba daemons -# - -SSD=/sbin/start-stop-daemon -SMB=/usr/sbin/smbd -NMB=/usr/sbin/nmbd -SMB_PID=/run/samba/smbd.pid -NMB_PID=/run/samba/nmbd.pid - - -print_status() { - $SSD --status --pidfile $2 - case $? in - 0) echo "$1 is running with pid $(cat $2)" ;; - 1) echo "$1 is not running but the pid file $2 exists" ;; - 3) echo "$1 is not running" ;; - 4) echo "Unable to determine the program status" ;; - esac -} - -case $1 in -start) - mkdir -p /run/samba - $SSD --start --pidfile $NMB_PID --exec $NMB -- -D - $SSD --start --pidfile $SMB_PID --exec $SMB -- -D - ;; -stop) - $SSD --stop --retry 10 --pidfile $SMB_PID - $SSD --stop --retry 10 --pidfile $NMB_PID - ;; -restart) - $0 stop - $0 start - ;; -reload) - /usr/bin/smbcontrol smbd reload-config - /usr/bin/smbcontrol nmbd reload-config - ;; -status) - print_status $SMB $SMB_PID - print_status $NMB $NMB_PID - ;; -*) - echo "usage: $0 [start|stop|restart|status]" - ;; -esac - -# End of file