From 3c0ac23fc220e56b44356d845aaf1b71df69c816 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 19:07:46 +0100 Subject: gentoo resync : 21.07.2018 --- net-fs/samba/Manifest | 7 ++-- net-fs/samba/files/4.4/samba4.confd | 2 +- .../files/samba-4.8-without_ads_build_fix.patch | 49 ---------------------- net-fs/samba/samba-4.7.7.ebuild | 1 + net-fs/samba/samba-4.8.3.ebuild | 1 + 5 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 net-fs/samba/files/samba-4.8-without_ads_build_fix.patch (limited to 'net-fs/samba') diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 1932e357ba66..da2695cdab3e 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,6 +1,6 @@ AUX 4.2/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d AUX 4.2/samba4.initd-r1 1103 BLAKE2B cf8a53aff9ec49a745168593e737c35d61ccc138ed304d27977a420f71440b4a7a0e241110180278684d26c5f848810c9b1bfc32af54a22f039119513765bccc SHA512 8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5 -AUX 4.4/samba4.confd 2036 BLAKE2B afc872734ee4b5d4332e1550e29dca6fdfe5e70a77018621df731aed5c69471294c5c9766050b1109bf978c785690930d8e6aa0429d60ae4d0b37487b4c2c8bf SHA512 122fa1eb8bcf43b0cab64be604c4cae82553f4fbff58ba831afdd2dd5e032618a875154bd50578aeba880a28c45027aa1fba66a76d1c3c28d5850fc098d9812c +AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af AUX 4.4/samba4.initd-r1 1125 BLAKE2B 204a639069495cfd711bd1c9dcd78a480e07bca7b760efdec49061f093d7e41dc6ce16b9264cc4762094bb7a796dc96d71003668416d40948036bd6fcc944a2e SHA512 982771fd7e1d260d8d4305eb18a3c15871f535b700d2b9554af24df62286e59ce6c5c76ef4ffee7a751fc01040eefaaabad71b2f67e3749ba1ee97a368b14d5a AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75b8b616e039e235f2202e4c5275421ec018911e92680da923d9403f7bfc65e1995216f4c157fef SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd898f2a942afb284e72a3a50454ffa63c201a3ad1b061d966107c749450cefe260e40090327f0144e1086e9bba4607c3811500 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 @@ -9,7 +9,6 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24 AUX samba-4.6-no_ads.patch 1102 BLAKE2B 34d7f4364a1eb5dc93cfdba3fe011d71361c134bcc7ed15f07731a8dbfc57d8b555b6942b3a1fb7ff1ae082d609849c0b8191613ed3880318102a03588a2d2ce SHA512 a077711b51801d7af215dec62782ef166e45fdc007a9a8f3ae724638d3d7f6e3177ace5be549d327964b787b1d64b7e0d4485fa4a2a013617824d991c547c780 AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5 -AUX samba-4.8-without_ads_build_fix.patch 1325 BLAKE2B 3a203397c4cc860f9681bf5015dcf36e2c4ba2672714fc95151548855790e7d0b517ca0568494a8915d02e492c02d3cbf07d5e4fc74a44acfe0153ffb62f2a5a SHA512 1947ec4a1d98c52e223763a7e3981642d3faa38c0e11e8f947c369b7e4ecde17d657e96fc8eeb3dd1ef8fa688c930c77a67e240d9176728583a9d8f55cf9a490 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 @@ -30,7 +29,7 @@ DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f EBUILD samba-4.2.14.ebuild 7140 BLAKE2B c09f771cb1db8d7be599084d4ad9956a41afefeeb9e2b229a9f215b24494348641a95c9f1da7048e18485f14f10dd7d2e0ba745b0c59930b0dbdf810ccd7119e SHA512 70ee5c801744693da54a8c0d944f41e80b60b1ce4a44b51bc36d0433ddbfe3ac98f704094f734faed3b425f08cd2c7543a9bfd4329ee450862a57475af1ac840 EBUILD samba-4.5.16.ebuild 8167 BLAKE2B d979c6b102cfcb3a77a18decad488ba40604fc9ac8d8889e114f09cef489897727197a09eed2c2d057a04aaf2367b3e4f53db260a2edc792db8cd2091113312b SHA512 db32b221d811e09f0a07c5d5fde3f528425c4a7375e8fa45fc9cca96d3b1e64f165f19836926efc8198f05bdb8ddc43f718854d82ad034a97d11f0423e36f2d6 EBUILD samba-4.6.15.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc -EBUILD samba-4.7.7.ebuild 8728 BLAKE2B 2ce8c1eeb3251f446af6844642bf449a7a0fa53ded5dc4202aee6f109cf76145c9fe201be37e371804d147d3c1870d97e554d1d7dbbf996c131ef7f0d40479c0 SHA512 390a7b3fa453a36061237e8f78e94d061e2f130c9fc7197ae21b14f296592868a775228042194cc36b0f6ce0bf2244c2d9314a38234316d5bf80b15fce33871c -EBUILD samba-4.8.3.ebuild 8308 BLAKE2B 44920ec9e0594446ffc441ef6b5a3843351b3ca0ab98516e5f3951e728e5ea1a99b30ae62ae9d890e65e95b11e7eeee05b19272c95c25ac6805baca39a4761c4 SHA512 c2f58f7f1f381241a97982cb760bbbe7f03f6203989ca59f9e7c290c23f6c5a19c46e1f1dba94a5ec84d925a8ccc0fdaf78602ec856877507e42b8ec5fc01e8b +EBUILD samba-4.7.7.ebuild 8803 BLAKE2B 5fe9b941bd95067a7b7820677af872f2c1d3e8a6076e7f1428446fed81e37181b61716706e5ce09383dc2415e7df2fbd60f5ba9dc94ddb6cafb08a81e76607a1 SHA512 dc30f815d2631838322e8fd1233e54a336e4be71dc8c274bd6085278869cf82d8e12f773d14079d1ebbd845cf875e3a0165126ba21c50e5742f849cc97b49521 +EBUILD samba-4.8.3.ebuild 8383 BLAKE2B f4abb5ea2efc4a15ddfc763290e0fc3d5328b1a02460a5490eafc7f4005202e2797154b4dc18ac6a61d9946a963b17471336b6cbe4b51932941f08d0c4e1df2c SHA512 377c4a72ea8eab9ef8bec96af6cfdeb07f43d3a430b93606c44f4a3b29ca9c23e1c2de8089d461994daf8baa983f979ed17727138f93e7093242704be6702dff EBUILD samba-4.9.0_rc1.ebuild 8392 BLAKE2B ee657d46873bb03311b2e18b2b89c2d196461dc34aff8931f4ec35bcb6e49a18a4147b899522646bda06f56410b3b557b05d280904096cf246aa8bcc902b5c23 SHA512 a389ed4223c5f3ab81a4b7048ac3efee94669b70c03ce960b53f8d0f0ca186831944bcf3645fae29d7afff74fc719a5d91d3c32d4843825ccce5c01249457827 MISC metadata.xml 1730 BLAKE2B d42bec763cdfdbee859606d1b39474dd9977bfb70ac597d2bbfb66bf5f77ca318b7064aa7f02eaf3ace85462fe19dd0f5da919f4a5c1d900d6a4dc57fc21688d SHA512 b10a146ac000f15e75701e49dbb672081b6704aa1f57c8d5bdac7a2983b5d8846c9b34634c81eec961ba683141202ce1197c980882d438b42beec25d9cfeece6 diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd index 2604981f2141..629a605021a2 100644 --- a/net-fs/samba/files/4.4/samba4.confd +++ b/net-fs/samba/files/4.4/samba4.confd @@ -32,7 +32,7 @@ nmbd_reload="killall -HUP nmbd" samba4_start_options="" samba4_command="/usr/sbin/samba" -samba4_pidfile="${piddir}/samba4.pid" +samba4_pidfile="${piddir}/samba.pid" samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}" samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}" samba4_reload="killall -HUP samba" diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch deleted file mode 100644 index a2a4702d0075..000000000000 --- a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Sat, 3 Feb 2018 07:07:55 +0100 -Subject: [PATCH] libgpo: Fix the build --without-ads - -Signed-off-by: Volker Lendecke -Reviewed-by: David Disseldorp - -Autobuild-User(master): David Disseldorp -Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331 - -(cherry picked from commit a222b7506b53e689708834237f18877231dca589) ---- - libgpo/pygpo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c -index 7a02a0d..b6b53b7 100644 ---- a/libgpo/pygpo.c -+++ b/libgpo/pygpo.c -@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, - return result; - } - -+#ifdef HAVE_ADS - static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const char *samaccountname, - uint32_t *uac_ret, const char **dn_ret) -@@ -468,11 +469,15 @@ out: - return ret; - } - -+#endif -+ - static PyMethodDef ADS_methods[] = { - { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, - "Connect to the LDAP server" }, -+#ifdef HAVE_ADS - { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, - NULL }, -+#endif - { NULL } - }; - --- -1.9.1 - diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild index 70a7a8aa61e8..9ed05cd5ef1f 100644 --- a/net-fs/samba/samba-4.7.7.ebuild +++ b/net-fs/samba/samba-4.7.7.ebuild @@ -50,6 +50,7 @@ CDEPEND=" net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] +