diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /net-fs/samba | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'net-fs/samba')
-rw-r--r-- | net-fs/samba/Manifest | 11 | ||||
-rw-r--r-- | net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch | 40 | ||||
-rw-r--r-- | net-fs/samba/samba-4.5.15.ebuild | 18 | ||||
-rw-r--r-- | net-fs/samba/samba-4.7.3.ebuild | 1 | ||||
-rw-r--r-- | net-fs/samba/samba-4.7.4.ebuild | 1 | ||||
-rw-r--r-- | net-fs/samba/samba-4.8.0_rc2.ebuild (renamed from net-fs/samba/samba-4.8.0_rc1.ebuild) | 1 |
6 files changed, 59 insertions, 13 deletions
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 17d902b69549..41fd21513198 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -7,6 +7,7 @@ AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd AUX samba-4.2.7-pam.patch 1273 BLAKE2B 41a17b701a592500f3b85be29fd134048ebd9403c510c339d1094f915c5eeae729972c7231169fa890dfde802797276a9c419eb17ed7a23e5ad1aaa46cdfd8ec SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24 +AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5 AUX samba-4.7.4-no_ads.patch 603 BLAKE2B 1da70c2fd2856f6270404f5b42bd6687507977234f2951d152e20ed99fcc76b7e0d67cc7f7abec89e4d7c50b2982f3abf770dde2694bf17213bc1d5bae7f19b7 SHA512 0310f45f4e060ffcd6ab17edfaba84a81f54147af6256f1d59c5b7314d4d638be35e0db79a6723a9adf9b54c87fc51af62b528ab52e3bcaa6102d1970715722e AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e @@ -25,15 +26,15 @@ DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb DIST samba-4.7.3.tar.gz 16845436 BLAKE2B d38f58a944d19f4475ab636f09a4f9b97b92897b1d8d041efc07e1d2724d07fafa3686b5d38b847b896c4f024f5cf7330eaca4b6eb4cd34da73a32fe94e8c69e SHA512 3fd9d5f208201e3137c5966e10878ba2fc00fa80b3468e8b402e08f941b5508edd7181720033aaa25fcff0ee0ae5438619423d41a9b9b3d14dc3743fbe3f902f DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65 -DIST samba-4.8.0rc1.tar.gz 17624979 BLAKE2B 9f2cf10aadf0c45c0489f59fd9dab6d0e9ce6bbfda8e3ddd4df712db5e805237761e6838f49738fb3abf7f68eec467f92a28e65dde13300ee90bc097b7f34db1 SHA512 6e3680cc2a472fc4acaf1c37bcd3a03b097bfc7f117e8ab79431c90d2f0c4159fcffa95f65dc5f3392366e4b0b6137991d5fe03ef4db839e130e93d1c1f73a61 +DIST samba-4.8.0rc2.tar.gz 17619396 BLAKE2B 3fc9a7f696df012ba1e1c9d131d650aaec27296b50a2a56d7941b066d164252b34bf9dad3119bb4f99b5a09eb11501a39bfb23d64e33c72e245fa825b418b573 SHA512 215c093b2144a858e646a075eeabfdd90790c7e6eeaed39cede98b254a68fc74dd93e3be314659d60437cbcdfc604b74f3b7faa75088bcf858e23a4a34dfb105 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e -EBUILD samba-4.5.15.ebuild 7872 BLAKE2B faa2930eeba57e377f9141d7673cb8ae5af5a04565004239c530347558dc308797e8e2e2a95ff95e18c6bd9a64514360b002e0d3c6a2d3d00bcbd53532ad83c3 SHA512 911eca475b841445608c70acb325005d0490993810df4c00209231032cee32a41992778cd4a5fc7e03f5f57463c1b4a0beffcca53b6c11ed9fcd265aea276964 +EBUILD samba-4.5.15.ebuild 8078 BLAKE2B 2d2dadac94370b98430bc608b14b2e34b9d44c55662fec3672f80064afdd8dc1cfb81920fc2bca83eaf23b139ce5f3f1972e0508ea075ca5f7b65d7aa5ee9fb5 SHA512 3e03a2351511f07c3fb92172230ae943293bb420b21cfa3eb5c4fae95fc89978a7e809e8cafda9871e2f590dcc97316e4370dee92a908d0dec6983c0bac3cca5 EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d -EBUILD samba-4.7.3.ebuild 8492 BLAKE2B 4a8d81457333d6057633946ac5c50a309c0ff3f0ffe60b6d6706d614dc9c1a72de07ec2006e2a5363cc01f9a73ab776121eb568c0f8e442344f274dc28007b60 SHA512 2b6c5bdd753f9f941ef38a59540f13881bd209337eca6bc84d9d8e7053f2a6d68229a47f3866cb934eeaa235596f14634a0d10709782126183dc4563c4a0a30f -EBUILD samba-4.7.4.ebuild 8525 BLAKE2B e98a537cbda904db990f35c9867bc51bfa96419f5a8f9f100d5533ed1eaa0e73d5455e1ad98799101114e97dded90563e812acf5494dfacf4e2f2fa603a31e76 SHA512 1639cfad70328394bbca2334c5ca71ba95e7aa39fe869992680caf15a131b637af7a609dc3e9edbbf78c7526813fbd2b5ad78e86b1e04b1783825f696c7b204a -EBUILD samba-4.8.0_rc1.ebuild 8257 BLAKE2B 65d7061376de0a4267a2c74dc9564890177b932f375340bb12fd7a2ee52551313bc759b7b834efa55858881138ca799bbbabad58e431aebf6a38ccf28af20e79 SHA512 f0e47fdc3550725627f487cb94aada1270ed337ccace51da293f47be924032ede17b2cc67d65f06f180ec5950fdae80e03c3716b05406c3bc0636d9e4e25455b +EBUILD samba-4.7.3.ebuild 8543 BLAKE2B b0a27da26793c0d740df166accadeba7737a025166815694f6b4de21957f5ecc724f0897abda4081b6a26ff0c4c2655918f4c46f1f1dc26a4acaeda528c847a0 SHA512 c94b897fd42f8acd4c069ba7b30a0c969024bc08c22962f273d4d1dcf1642147b93c238fd280d9a496ad0188e1fd09911631feec564dd9b35e94270ee6b0adad +EBUILD samba-4.7.4.ebuild 8576 BLAKE2B d7984124f1f0afab7b5870d207f2b532cc03faad0160e569681312f363475f5ecdf4aa10008c3d20b22e1e96a70f15526b53fe3545644ae59fd1e3e9a6e37fb1 SHA512 09ba72839aa22463427b9e3a42e626bf8ed312b6294369b8167ad63a5bedb511e7181d3108200ecb73fdbffeb67d108b5b30cdcaa340811908b5165db59e3a4c +EBUILD samba-4.8.0_rc2.ebuild 8204 BLAKE2B 4d6bc1fa225090a4566d0c421477d7dbc58d48767b2bcd2bd3ce62aec61e55e947425be6ce04fbbef3a098767e995a0b7a1f91b12c16a4b3affec3385492bad4 SHA512 71aa87b597b21afd7a69f6778883fbd4cd25fe0882a98229e86a0e77630911b96db07dce11031dab32f6956c78e62375d440385e8b2b8d11e74dbfb6b855051d MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch new file mode 100644 index 000000000000..9fad9fca44fb --- /dev/null +++ b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch @@ -0,0 +1,40 @@ +https://lists.samba.org/archive/samba-technical/2017-December/124344.html +https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836 + +From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001 +From: Zentaro Kavanagh <zentaro@chromium.org> +Date: Mon, 11 Dec 2017 12:41:16 -0800 +Subject: [PATCH] Remove unsupported colon from configure msg. + +- When cross-compiling an answers file must be supplied via + --cross-compile --cross-answers=<path to answers>. +- The lines in the answer file have the form; + Config Msg: Answer +- The colon is used to delimit the msg and the answer when reading + the answers file. +- WAF doesn't support the message containing a colon. +- It's not possible to override this variable so cross compile fails. + +Signed-off-by: Zentaro Kavanagh <zentaro@google.com> +Reviewed-by: Uri Simchoni <uri@samba.org> +Reviewed-by: Andrew Bartlett <abartlet@samba.org> +--- + wscript_configure_system_mitkrb5 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 +index 9c351131ad1a..803dad7ab63b 100644 +--- a/wscript_configure_system_mitkrb5 ++++ b/wscript_configure_system_mitkrb5 +@@ -282,7 +282,7 @@ conf.CHECK_CODE(''' + ''', + 'HAVE_WRFILE_KEYTAB', + headers='krb5.h', lib='krb5', execute=True, +- msg="Checking whether the WRFILE:-keytab is supported"); ++ msg="Checking whether the WRFILE -keytab is supported"); + # Check for KRB5_DEPRECATED handling + conf.CHECK_CODE('''#define KRB5_DEPRECATED 1 + #include <krb5.h>''', +-- +2.15.1 + diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild index 228698438157..05538c6aadf3 100644 --- a/net-fs/samba/samba-4.5.15.ebuild +++ b/net-fs/samba/samba-4.5.15.ebuild @@ -16,7 +16,7 @@ SRC_PATH="stable" SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz" [[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" DESCRIPTION="Samba Suite Version 4" HOMEPAGE="http://www.samba.org/" @@ -27,6 +27,12 @@ SLOT="0" IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/policy.h /usr/include/samba-4.0/dcerpc_server.h @@ -79,12 +85,10 @@ DEPEND="${CDEPEND} dev-libs/libxslt virtual/pkgconfig test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.7 - >=sys-libs/uid_wrapper-1.2.1 - ) + >=sys-libs/nss_wrapper-1.1.3 + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.7 + >=sys-libs/uid_wrapper-1.2.1 )" RDEPEND="${CDEPEND} client? ( net-fs/cifs-utils[ads?] ) diff --git a/net-fs/samba/samba-4.7.3.ebuild b/net-fs/samba/samba-4.7.3.ebuild index 5656d87fe613..96bd7cdf5f9a 100644 --- a/net-fs/samba/samba-4.7.3.ebuild +++ b/net-fs/samba/samba-4.7.3.ebuild @@ -119,6 +119,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" "${FILESDIR}"/talloc-disable-python.patch "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 + "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild index bcab7bd8aec3..13fa3acc76c3 100644 --- a/net-fs/samba/samba-4.7.4.ebuild +++ b/net-fs/samba/samba-4.7.4.ebuild @@ -119,6 +119,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" "${FILESDIR}"/talloc-disable-python.patch "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 + "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch" "${FILESDIR}/${P}-no_ads.patch" ) diff --git a/net-fs/samba/samba-4.8.0_rc1.ebuild b/net-fs/samba/samba-4.8.0_rc2.ebuild index bf0eef6a4ea5..28420233a0a4 100644 --- a/net-fs/samba/samba-4.8.0_rc1.ebuild +++ b/net-fs/samba/samba-4.8.0_rc2.ebuild @@ -121,7 +121,6 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 "${FILESDIR}/${PN}-4.7.4-no_ads.patch" ) |