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 index 4d3aaa2af2..d30cd1649f 100644 --- 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,7 +1 @@ -DIST samba-4.11.13.tar.gz 18598813 BLAKE2B 5671498058e61c1afbdb0976b6931dc4e13087792612d4fdc3073e8e40a60be82f578836e3baa48f111a600da5c6e0e08aa7ba638fbc1285bbb57644ae7e8b1d SHA512 396ab636db6f9583b772935d58a3cf1860109bb9e1ef841a38c08d7be9f3839d6e198d5cdc80ef0803fcbfa6c06f1173585f3b582937e8834857fc47d90f7181 -DIST samba-4.12.10.tar.gz 18244366 BLAKE2B 34361b7734b9865d2c2fa2fbfaf99c3f0b1efb8ea33c1289ff70703180369d21bcb341ff0b4bb3e90f55f8b9745b579d5d66472c394a735e757ba1c6325daa63 SHA512 9437d7c05bd6f7f0bf6dfd7ef9c475f30ef6572095c96e1d494a8b917bd139122677a5e25f803579f0fd27a6053f5e99684780684dccce0e259cdefd684ce5e5 -DIST samba-4.12.7.tar.gz 18230157 BLAKE2B cf0ed50177e1e0d840892753537d8fab8c31ed4a6ba9b4e6bfc12e56c9f14a760c9e3dd230dc8e6caf2d7493e204bffb2fbd1bfa0931ae3fd93311ae2d5b3e32 SHA512 5afb1f24b029e665bb4f6bd7b7cf915243476b09b304942b2105586fa99adc6a19b46b4753ca116e230e5bb7b82e011fbe296c62bc70a8a897e56aece55a7f0b -DIST samba-4.12.8.tar.gz 18235713 BLAKE2B cdebcc3203c1eb7972f63d1844f91423729d7296261756e6a9250a6732c908822e01aeb4914f00f890c359d23c1ddb2e51d477db63cb559d3e029a2b15607cd6 SHA512 63f6db229e1393f4e3bd0381f8336f4620b2178c88a35acde69826567c4cca4030eb8c71c45d8f249ecd95d453916442c0500e408f3683517c3894cc8d11a9ed DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6 -DIST samba-4.13.1.tar.gz 18413369 BLAKE2B 0a0b867fc1287b82348670802cda390b259e9664c57bdd6804c88fdacb1671637f1fe941240dc22195efe82fd33a9b95859b8657a089f3e3daf8bd0b7cad09cf SHA512 ee275cc64e2133e55832a41081238c348ce48c55d47c8a8248bd19653b152324ab2080e70b716d3616522dd22470e0d06babd350410790062635fb077a032319 -DIST samba-4.13.2.tar.gz 18418249 BLAKE2B 9e3b9c284c56a90c22f3bbfb51bfcbd7d1eb8dc8e8b399c13537ea1b1265922e67d1e780f68fec6858bb93dca6a49284d01a723633909a3156f750b0482798b7 SHA512 60b8597b7fad13dd55ffec4c750ee4f5f39220d8e8d52232d3a8c4d830a5ff29254716a7230b0182e0717585e5a34b01373527caecd1d32f2170c6063a97d070 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r1.ebuild index d719891701..d2f6b20e6c 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.12.9-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE='threads(+),xml(+)' inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam @@ -26,6 +26,7 @@ SLOT="0" IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux snapper syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" +IUSE+=" +minimal" # Flatcar: Only install libraries, not executables. MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/policy.h @@ -40,35 +41,24 @@ MULTILIB_WRAPPED_HEADERS=( CDEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= dev-libs/icu:=[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/libtasn1[${MULTILIB_USEDEP}] + !minimal? ( dev-libs/libtasn1[${MULTILIB_USEDEP}] ) dev-libs/popt[${MULTILIB_USEDEP}] - dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - >=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] - =sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) - $(python_gen_cond_dep " - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] - ) - ") + addns? ( + net-dns/bind-tools[gssapi] + dev-python/dnspython + ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto @@ -90,6 +80,7 @@ CDEPEND=" DEPEND="${CDEPEND} ${PYTHON_DEPS} app-text/docbook-xsl-stylesheets + dev-lang/perl:= dev-libs/libxslt >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] net-libs/libtirpc[${MULTILIB_USEDEP}] @@ -168,9 +159,6 @@ src_prepare() { sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die fi - ## ugly hackaround for bug #592502 - #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - sed -e 's:::' \ -i source4/dsdb/samdb/ldb_modules/password_hash.c \ || die @@ -187,6 +175,9 @@ multilib_src_configure() { bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" fi + # Flatcar: Don't depend on tons of new packages with broken cross-compilation support. + bundled_libs=ALL + local myconf=( --enable-fhs --sysconfdir="${EPREFIX}/etc" @@ -200,6 +191,7 @@ multilib_src_configure() { --nopyc --nopyo --without-winexe + --disable-python $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') $(multilib_native_use_with addns dnsupdate) @@ -277,7 +269,7 @@ multilib_src_install() { newinitd "${CONFDIR}/samba4.initd-r1" samba newconfd "${CONFDIR}/samba4.confd" samba - systemd_dotmpfilesd "${FILESDIR}"/samba.conf + [[ ! use_minimal ]] && systemd_dotmpfilesd "${FILESDIR}"/samba.conf use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die # Preserve functionality for old gentoo-specific unit names @@ -298,6 +290,20 @@ multilib_src_install() { 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 + mv "${ED%/}"/usr/bin/net "${T}"/ + rm -f "${ED%/}"/usr/bin/* "${ED%/}"/usr/sbin/* + mv "${T}"/net "${ED%/}"/usr/bin/net + rm -rf ${ED%/}/lib*/security + rm -rf ${ED%/}/usr/lib/systemd + rm -rf ${ED%/}/usr/lib*/perl* + rm -rf ${ED%/}/usr/lib*/python* + rm -rf ${ED%/}/var + fi } multilib_src_test() {