[patch] Output of "git log -p -C -C origin/master.. -- net-fs/samba/"

gentoo_pull_11850.diff (text/plain), 7.24 KB, created by Marc Joliet on 2019-05-11 18:29:03 UTC

commit 945a63f439dd3368aeb1b2ba5e259ccce842ed26
Author: Marc Joliet <[e-mail]>
Date:   Sun Apr 28 14:40:24 2019 +0200

    net-fs/samba: add new USE flag "profiling-data"
    
    Add a new USE flag "profiling-data" that, when set, allows the use of
    the "smbd profiling level" option in smbd.conf or, equivalently, the -P
    option to smbd.  This is useful in conjunction with monitoring software,
    e.g., netdata.
    
    Closes: https://bugs.gentoo.org/685484
    Package-Manager: Portage-2.3.62, Repoman-2.3.11
    Signed-off-by: Marc Joliet <[e-mail]>

diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 97a8476c02f..fb277df6bb3 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
 		<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
 		<flag name="iprint">Enabling iPrint technology by Novell</flag>
+		<flag name="profiling-data">Enables support for collecting profiling data</flag>
 		<flag name="quota">Enables support for user quotas</flag>
 		<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
 			bundled heimdal.</flag>
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
similarity index 97%
copy from net-fs/samba/samba-4.10.2.ebuild
copy to net-fs/samba/samba-4.10.2-r1.ebuild
index 636b9efa77a..9abce7be82c 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2-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/"
@@ -23,8 +23,9 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -219,6 +220,7 @@ multilib_src_configure() {
 		$(use_enable gnutls)
 		$(use_with debug lttng)
 		$(use_with ldap)
+		$(use_with profiling-data)
 	)
 
 	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
similarity index 96%
copy from net-fs/samba/samba-4.5.16.ebuild
copy to net-fs/samba/samba-4.5.16-r1.ebuild
index 3fd2ad28eb1..14c14603a34 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 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/"
@@ -24,8 +24,9 @@ LICENSE="GPL-3"
 
 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"
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap
+pam profiling-data 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
@@ -214,6 +215,7 @@ multilib_src_configure() {
 			--disable-iprint
 			$(use_with ldap)
 			--without-pam
+			$(use_with profiling-data)
 			--without-quotas
 			--without-syslog
 			--without-systemd
diff --git a/net-fs/samba/samba-4.7.12-r1.ebuild b/net-fs/samba/samba-4.7.12-r2.ebuild
similarity index 98%
copy from net-fs/samba/samba-4.7.12-r1.ebuild
copy to net-fs/samba/samba-4.7.12-r2.ebuild
index 98b097983e0..5a75bd6e88d 100644
--- a/net-fs/samba/samba-4.7.12-r1.ebuild
+++ b/net-fs/samba/samba-4.7.12-r2.ebuild
@@ -23,8 +23,9 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -211,6 +212,7 @@ multilib_src_configure() {
 			$(use_with ldap)
 			$(use_with pam)
 			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+			$(use_with profiling-data)
 			$(use_with quota quotas)
 			$(use_with syslog)
 			$(use_with systemd)
diff --git a/net-fs/samba/samba-4.8.9.ebuild b/net-fs/samba/samba-4.8.9-r1.ebuild
similarity index 98%
copy from net-fs/samba/samba-4.8.9.ebuild
copy to net-fs/samba/samba-4.8.9-r1.ebuild
index cc6479aa66b..3bf6abfad3c 100644
--- a/net-fs/samba/samba-4.8.9.ebuild
+++ b/net-fs/samba/samba-4.8.9-r1.ebuild
@@ -23,8 +23,9 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -214,6 +215,7 @@ multilib_src_configure() {
 		$(use_enable gnutls)
 		$(use_with debug lttng)
 		$(use_with ldap)
+		$(use_with profiling-data)
 	)
 	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
 
diff --git a/net-fs/samba/samba-4.9.6.ebuild b/net-fs/samba/samba-4.9.6-r1.ebuild
similarity index 98%
copy from net-fs/samba/samba-4.9.6.ebuild
copy to net-fs/samba/samba-4.9.6-r1.ebuild
index 6427d579620..b254b52dad4 100644
--- a/net-fs/samba/samba-4.9.6.ebuild
+++ b/net-fs/samba/samba-4.9.6-r1.ebuild
@@ -23,8 +23,9 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -218,6 +219,7 @@ multilib_src_configure() {
 		$(use_enable gnutls)
 		$(use_with debug lttng)
 		$(use_with ldap)
+		$(use_with profiling-data)
 	)
 	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )