Merge pull request #1324 from flatcar/krnowak/samba-update

krnowak · web-flow · commit 3eb7776d8a87 · 2023-11-02T13:09:02.000+01:00
overlay net-fs/samba: Update to 4.18.8
diff --git a/changelog/security/2023-11-01-samba-update.md b/changelog/security/2023-11-01-samba-update.md
@@ -0,0 +1 @@
+- samba ([CVE-2023-4091](https://nvd.nist.gov/vuln/detail/CVE-2023-4091))
diff --git a/changelog/updates/2023-11-01-samba-update.md b/changelog/updates/2023-11-01-samba-update.md
@@ -0,0 +1 @@
+- samba ([4.18.8](https://www.samba.org/samba/history/samba-4.18.8.html))
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/Manifest b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/Manifest
@@ -1 +1 @@
-DIST samba-4.18.4.tar.gz 41311410 BLAKE2B 1f1aab7eb933111b9b1c72af8c3dd379fe34014085129e9d5cc400b4e434742e1c08ad4fdf2a98291d6063ce9b2ddc811e9ab5dbb133a85e97f2158f83dd7c96 SHA512 bc8d792b510061556c07b6844a825801a4271eed45e01133a4718c1839d123e2908fa0e31e67af43098500e98a9082eb104052e711a8a034fac23d86e15c29ee
+DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/files/samba-4.18.4-bug-15418-windows-update-secure-channel.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/files/samba-4.18.4-bug-15418-windows-update-secure-channel.patch
diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.18.8.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.18.8.ebuild
@@ -109,7 +109,7 @@ COMMON_DEPEND="
 		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
 	)
 	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
@@ -149,7 +149,6 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.18.4-pam.patch
-	"${FILESDIR}"/${PN}-4.18.4-bug-15418-windows-update-secure-channel.patch
 	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
 )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- samba ([CVE-2023-4091](https://nvd.nist.gov/vuln/detail/CVE-2023-4091))`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- samba ([4.18.8](https://www.samba.org/samba/history/samba-4.18.8.html))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-DIST samba-4.18.4.tar.gz 41311410 BLAKE2B 1f1aab7eb933111b9b1c72af8c3dd379fe34014085129e9d5cc400b4e434742e1c08ad4fdf2a98291d6063ce9b2ddc811e9ab5dbb133a85e97f2158f83dd7c96 SHA512 bc8d792b510061556c07b6844a825801a4271eed45e01133a4718c1839d123e2908fa0e31e67af43098500e98a9082eb104052e711a8a034fac23d86e15c29ee`
	`1`	`+DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ COMMON_DEPEND="`
`109`	`109`	`sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]`
`110`	`110`	`)`
`111`	`111`	`snapper? ( sys-apps/dbus )`
`112`		`- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )`
	`112`	`+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )`
`113`	`113`	`system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )`
`114`	`114`	`systemd? ( sys-apps/systemd:= )`
`115`	`115`	`unwind? (`
`@@ -149,7 +149,6 @@ BDEPEND="${PYTHON_DEPS}`
`149`	`149`
`150`	`150`	`PATCHES=(`
`151`	`151`	`"${FILESDIR}"/${PN}-4.18.4-pam.patch`
`152`		`- "${FILESDIR}"/${PN}-4.18.4-bug-15418-windows-update-secure-channel.patch`
`153`	`152`	`"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch`
`154`	`153`	`)`
`155`	`154`