gentoo auto-resync : 29:07:2022 - 21:08:17

5 files changed, 24 insertions, 7 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index afe3c1c5a0b3..515cab52d99c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,7 @@
 AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
 AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696d8e933d90b385f0c958a493ab684436915630de2884383e24eb1c9955ebd2b526b0b8f30438d9204dcb57 SHA512 3bfa4c8e0d77994fbca25eb0e12617166909c4d6742d1800c73f5640a7c39ee760988a315d39ddf8a575097df3d3c6fe3f308e8ca1cd698018544a9060176f4e
 AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
+AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
 AUX samba-4.16.1-netdb-defines.patch 546 BLAKE2B eb42eb3429a221d700cc53381cda2a2dbff72cf43a0c3d5d8564d5e264a1ffaff15e3fd13f9647dd0a76e99323d656c07f26cf9c941f7407769c1a986c8c9025 SHA512 3802cf51d1dbcdf631ab4ffdc115ea58ad8d7bf1a23600e91eff2a70fcffb80161a3e87c360f7c961dae99c8f0267bf8f9feed739b388d012ece32bcf97c1dcf
 AUX samba-4.16.2-fix-musl-without-innetgr.patch 779 BLAKE2B cf6ba59edd10b6540f052dd9702d2e541cf8a7c864195485a5ab1bcf7acde8b1df875b8eded3f111eb1e71818ba88aa4df95482334563179f31e8dcc31bb9a3e SHA512 123c8885957c75893bebf8362778d978ad69102763fd87439cdd265316f72a60f7df86e4a1219ccb37df365ff3e54308f8b6c5cf6c0aa9189f17e0e9568737aa
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
@@ -18,13 +19,13 @@ DIST samba-4.16.2.tar.gz 30597031 BLAKE2B d1268cb34ef951a47bd6cd8b76fa8576f3db2a
 DIST samba-4.16.4.tar.gz 30605121 BLAKE2B e685511a76770272cabd1292f36d2b005e2d21212e4782cdf4fd05039f7667b35501873cffa9a53547d523805b2a91ffeba0881aaee905304968c42efef22dfa SHA512 9754275ace30755b75f747e201f8ad4550a823c8606e550c0ce6b3ccbaf048dd895bf2c21127271298304be7f80de9b6451091c4949ebe267ee1cf3ab497cd85
 EBUILD samba-4.14.12-r3.ebuild 10031 BLAKE2B ef98c98e96c6bc442ae917f5ea98eac20ad8b47e5cf95d629c3c057885a5e0d2b15c57d435c792b2a4edc5d8e75a76a4b0903d08efab1b9832e8a324c23d1357 SHA512 e73d8c96e32582e5c7fb80dfa89f4c1506106e8dc9bdb07e17ab676c1d8c2a9b319e1f4e5d2cf76046dfc5b78868484fca5c32b1835ca06701e6719be754b635
 EBUILD samba-4.14.13.ebuild 10032 BLAKE2B d7cdcb67afe6dbb05e9a7fa8c3b9f5d3749cf91ed035c7581c504ad5db8c01dc21d8bf69a6a07e61e4d0a0db680677b7f51c5774b3d0ef5eb8758b91b0bd773a SHA512 1f96a484968fccb76e3985025701fd3ac97d191377ac3295212f78eeec5160af9919bd0738d8278f3a7bf0adb2ecbd04b9cc5e7405485f0e1a07c659e25d5c9b
-EBUILD samba-4.14.14.ebuild 10039 BLAKE2B 45ebf1d86df61fc705e0298cf9e15cd7bf679222d338ba5f7109ef6f76d5cd75ae974c9407d2cf3887e139b7dc0993df1a719a2a130df6418552939c20530009 SHA512 26b1b775bd3a8c2e9bc71b27b0b85ac5549adf19bdcc3b50a18589a597b22602a7f75ffb1b10370042c28c2e8bc3ae00c77f5e498b5f765b6b4efc73fbc5d788
+EBUILD samba-4.14.14.ebuild 10166 BLAKE2B f35e1b27a38f6a0eab5466c45e8ec045571c75399fa3ddcedfc5ce705bc498ae3fea2b880728b0e778d13c323a6a842822eb76f9d8b26e4973b5bc678a45a2a4 SHA512 59060251c5fbb0071ada04d74fc8ba23581c4f7e309edde4d732dfb08e1632317fff4f6d851e28b35953d5da7fa795a8277da1eb2cb7393bc454467208efad9c
 EBUILD samba-4.15.4-r3.ebuild 9964 BLAKE2B 33e95d71e3a5d3172fc8dae76807e198b2ef4100d32d5e8bee2964dd41b2a9f3396c3b9b9d2a93e75ec47b94365871c6005ceca35a153f42f5e143b8fe2c24aa SHA512 bacfa5b5a1c29f8eefaea6b5b31134ce8a0059b2365987453cf14994ae0122cca4e241445e600689072eab27ca1809347c0321515728da792a166aad37801fe1
 EBUILD samba-4.15.6-r1.ebuild 10022 BLAKE2B 0588e5c12f2c4d31bc8e34c50de2cc8894d7eb62df1d55f243f067e0938408fea6fa0cba01d47606ad132e560214a76f2771f2197318b2757c988255a18d0a3a SHA512 45f04624f8a88acbc4b3939d7192c38bc3e86495a4ce2e16095aeb66b7eda7ae68ff4f920fa50577cf27a16791edfa621497094f287c13bb758f5e0117bd9788
 EBUILD samba-4.15.7.ebuild 10015 BLAKE2B 2c9fb60746e70d5fb0582f75da7b0af11a51ba4f1b080716fb82c8dbc62de22b340d99e715e5bbee2f7c05cc8eb95ab414bca68f6a37eb1cd696878bc54fd717 SHA512 07e02a792279cb9a7a2db43722b9f2c6652fb67b52c0adaf3c894fc5c88a43f294a51ab32fc8bc403e6fa03661c16dc4aefb0950837c8135414225ac802a9157
-EBUILD samba-4.15.9.ebuild 10022 BLAKE2B 29e5d9bc88635df131f2ed64ef0c271932f1f39601ca5714be1ace27bec18a33269d86059d47d26b05c280652fb0ec00089d1545377ed054b9da3a38b3114f66 SHA512 a85457c41f014f1a4f014ea8d9abab8a2546de733a1463a73fca21c391c4e6b20f2608f601d7e056103b1390dd56434042abf2e338af969eb239cc5d68f27cc2
+EBUILD samba-4.15.9.ebuild 10075 BLAKE2B 11c43c5b5f054a3bc2646b9c5652d588a15b31fbdd9a22a2449a01585fbcf7d339e818040bc56822f430ac346cdbb77da76acb314ccab9e21a19216bd35f497e SHA512 4fbed884141cd19c0849a2cc70aba65cc6212e408aa5ec4241614fe0f48c9608854ac016b32086de17d7e1917117476b780c540626cfcdd316110ccbc8a50498
 EBUILD samba-4.16.0-r1.ebuild 10037 BLAKE2B 8679d1dbc9fe6a550eecfb86fb32ab26297c9b02eccc8a36621bcc13be96c70450e25759d9ffb810f87a43b6768e2bdbc459a990bbf4fbc261ff5bee5bac2ddf SHA512 75ff78eae02920315c40d74d7348a5ff98d5d20abc463a615e572602d2daf6e61f6fa66fbd910933c883ca9e7731360441d1fe575b2643926dace994fb59a549
 EBUILD samba-4.16.1.ebuild 10085 BLAKE2B e652f81751b0e4971ba0f1850cdf6a629732b998f0a97a91f4a623a28a6ef1e67cb0d949144bd8e62f46cf1b970d62b4d5db73deec39420b68e0b913c71dbe4d SHA512 82f77c0504b778265c346347b1f9ca1955fbb436c23cb285985f0271013a221c121aba707eb055ec4215137d7a998356d8199fef100a811fe5a4156d2f1224ee
 EBUILD samba-4.16.2.ebuild 10117 BLAKE2B a11e7d116874f83589503eaeb3b5f689ab01e0c884d89665cd8586800599f7bd7dec1068e174cfaafe77f18add3a7f89cc4581a4a71319b68ad8e7478f52bf14 SHA512 59ec9c24962ae778c7b4928bbbd27bd0083fb13b5510e611aa3b5383334db77fedd2b97449b2f17e6ea76309fe61d7d89e8878add620f2333cda3199ddd5bc7e
-EBUILD samba-4.16.4.ebuild 10117 BLAKE2B c6716648f6f610c1f378d8d9d34ed4e6ea8fff59ef9fc7bc7ba880eda5253d55932de22d11a24d65519c91e5c27a764ac7a81ee03da58a256902e4e7db353e20 SHA512 837eacab1cc4017f22049b1ff2bfcd57e1f5a1363dac582a33180909ef26628c8a17222f576708e8f1291bab0dc6d312adc5d63b3c9c7c078d92cf7bf1d69f37
+EBUILD samba-4.16.4.ebuild 10170 BLAKE2B e6179fae0d08d6c22babe8cd34390f9796ae11991fe18e69b35924a196ffe5fe98738c0543ccefe3424f48d107fcfbab908f55b3582564ed6786854fc15b6579 SHA512 84a4afe9253197da0f50378a526b2cf5b34685ff45a00a615b3d4bfd557a9e3a1aa28adc06f8a0ce9a2f249553b7e4d093a6d486f9fb4078047fc30114f9c5d4
 MISC metadata.xml 2061 BLAKE2B b6232fb0408426e595b8569a26aba4938e2e0edd61cf4d73650ee4eed48725ca3181c212003515ef573a95bd73659fe482d964e26fef3ff61a66e06f0566b600 SHA512 301d931501a67d7189881fb269c31f75790b99c3c6c74caea963507ca5a60e5ae39bfd97f8d7e2f3096ae71645c8d7abea36d70ae621017c72cb20c9ec51d2d8
diff --git a/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
new file mode 100644
index 000000000000..4578435064b0
--- /dev/null
+++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
@@ -0,0 +1,12 @@
+--- ldb-1.3.6/lib/tevent/wscript
++++ ldb-1.3.6/lib/tevent/wscript
+@@ -34,8 +34,7 @@
+         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
+                                      onlyif='talloc', implied_deps='replace talloc'):
+             conf.define('USING_SYSTEM_TEVENT', 1)
+-            if not conf.env.disable_python and \
+-                conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
++            if not conf.env.disable_python:
+                 conf.define('USING_SYSTEM_PYTEVENT', 1)
+ 
+     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
diff --git a/net-fs/samba/samba-4.14.14.ebuild b/net-fs/samba/samba-4.14.14.ebuild
index d7e8bd93a28f..82300ebb6402 100644
--- a/net-fs/samba/samba-4.14.14.ebuild
+++ b/net-fs/samba/samba-4.14.14.ebuild
@@ -22,10 +22,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
+IUSE="acl addc addns ads ceph client cluster cpu_flags_x86_aes cups debug fam
+glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit
+selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test
+winbind zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
@@ -143,6 +143,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -209,6 +210,7 @@ multilib_src_configure() {
 		--nopyc
 		--nopyo
 		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
 		$(multilib_native_use_with acl acl-support)
 		$(multilib_native_usex addc '' '--without-ad-dc')
 		$(multilib_native_use_with addns dnsupdate)
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9.ebuild
index a2c269deaa76..2ba0530bb6ae 100644
--- a/net-fs/samba/samba-4.15.9.ebuild
+++ b/net-fs/samba/samba-4.15.9.ebuild
@@ -140,6 +140,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4.ebuild
index 6aa50af58785..02f5797dfdc2 100644
--- a/net-fs/samba/samba-4.16.4.ebuild
+++ b/net-fs/samba/samba-4.16.4.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
 	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"