Merge pull request #834 from kinvolk/contributions/update-to-samba-4.12.9

Contributions/update to samba 4.12.9

sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild

@@ -47,6 +47,7 @@ DEPEND="
 	sys-firmware/edk2-ovmf
 	sys-fs/btrfs-progs
 	sys-fs/cryptsetup
+	dev-perl/Parse-Yapp
 	"
 
 # Must match the build-time dependencies listed in selinux-policy-2.eclass

sdk_container/src/third_party/coreos-overlay/net-fs/samba/Manifest

@@ -1 +1 @@
-DIST samba-4.11.13.tar.gz 18598813 BLAKE2B 5671498058e61c1afbdb0976b6931dc4e13087792612d4fdc3073e8e40a60be82f578836e3baa48f111a600da5c6e0e08aa7ba638fbc1285bbb57644ae7e8b1d SHA512 396ab636db6f9583b772935d58a3cf1860109bb9e1ef841a38c08d7be9f3839d6e198d5cdc80ef0803fcbfa6c06f1173585f3b582937e8834857fc47d90f7181
+DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6

sdk_container/src/third_party/coreos-overlay/net-fs/samba/files/4.4/samba4.initd-r1

@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 extra_started_commands="reload"
@@ -7,7 +7,6 @@ extra_started_commands="reload"
 
 depend() {
 	after slapd
-	need net
 	use cupsd
 }
 

sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r1.ebuild

@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
@@ -41,12 +41,14 @@ MULTILIB_WRAPPED_HEADERS=(
 
 CDEPEND="
 	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	!minimal? ( dev-libs/libtasn1[${MULTILIB_USEDEP}] )
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=net-libs/gnutls-3.2.0[${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
 	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	sys-libs/libcap
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	sys-libs/zlib[${MULTILIB_USEDEP}]
@@ -80,7 +82,7 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-lang/perl:=
 	dev-libs/libxslt
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	|| (
@@ -99,7 +101,6 @@ RDEPEND="${CDEPEND}
 	python? ( ${PYTHON_DEPS} )
 	client? ( net-fs/cifs-utils[ads?] )
 	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
 "
 
 REQUIRED_USE="
@@ -124,7 +125,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.11-fix-glibc-2.32-function-collisions.patch"
 	"${FILESDIR}/${PN}-4.13-winexe_option.patch"
 	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
 )
@@ -191,7 +191,7 @@ multilib_src_configure() {
 		--nopyc
 		--nopyo
 		--without-winexe
-		--disable-python  # Flatcar: Don't build libraries requiring Python.
+		--disable-python
 		$(multilib_native_use_with acl acl-support)
 		$(multilib_native_usex addc '' '--without-ad-dc')
 		$(multilib_native_use_with addns dnsupdate)
@@ -269,9 +269,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		if ! use minimal ; then
+		[[ ! use_minimal ]] && systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-			systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		fi
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names
@@ -290,8 +288,10 @@ multilib_src_install() {
 	keepdir /var/cache/samba
 	keepdir /var/lib/ctdb
 	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
 	keepdir /var/log/samba
 
+
 	rm -f "${ED%/}"/etc/samba/*
 	rm -f "${ED%/}"/usr/lib*/samba/ldb/*
 	if use minimal ; then
@@ -306,12 +306,6 @@ multilib_src_install() {
 	fi
 }
 
-multilib_src_install_all() {
-	# Attempt to fix bug #673168
-	find "${ED}" -type d -name "Yapp" -print0 \
-		| xargs -0 --no-run-if-empty rm -r || die
-}
-
 multilib_src_test() {
 	if multilib_is_native_abi ; then
 		"${WAF_BINARY}" test || die "test failed"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords

@@ -11,3 +11,6 @@ virtual/rust ~amd64
 # Accept go utilities
 dev-go/glide ~amd64
 dev-go/godep ~amd64
+
+# Accept perl libs required to build >=samba-4.12
+dev-perl/Parse-Yapp ~amd64 ~arm64