Diff samba-4.5.16 with a samba-4.7.12-r1

/usr/portage/net-fs/samba/samba-4.7.12-r1.ebuild 2019-01-24 12:09:00.000000000 +0300
1
# Copyright 1999-2018 Gentoo Foundation
1
# Copyright 1999-2019 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=6
5 5
PYTHON_COMPAT=( python2_7 )
6 6
PYTHON_REQ_USE='threads(+),xml(+)'
7 7

  
8
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
8
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils pam
9 9

  
10 10
MY_PV="${PV/_rc/rc}"
11 11
MY_P="${PN}-${MY_PV}"
......
13 13
SRC_PATH="stable"
14 14
[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
15 15

  
16
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
17
	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
16
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
18 17
[[ ${PV} = *_rc* ]] || \
19
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
18
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
20 19

  
21 20
DESCRIPTION="Samba Suite Version 4"
22 21
HOMEPAGE="https://www.samba.org/"
......
24 23

  
25 24
SLOT="0"
26 25

  
27
IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
26
IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
28 27
quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
29 28

  
30
# the test suite is messed, it uses system-installed samba
31
# bits instead of what was built, tests things disabled via use
32
# flags, and generally just fails to work in a way ebuilds could
33
# rely on in its current state
34
RESTRICT="test"
35

  
36 29
MULTILIB_WRAPPED_HEADERS=(
37 30
	/usr/include/samba-4.0/policy.h
38 31
	/usr/include/samba-4.0/dcerpc_server.h
......
45 38
)
46 39

  
47 40
# sys-apps/attr is an automagic dependency (see bug #489748)
48
CDEPEND="${PYTHON_DEPS}
41
CDEPEND="
49 42
	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
50 43
	dev-lang/perl:=
51 44
	dev-libs/libaio[${MULTILIB_USEDEP}]
......
53 46
	dev-libs/iniparser:0
54 47
	dev-libs/popt[${MULTILIB_USEDEP}]
55 48
	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
49
	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
56 50
	net-libs/libnsl:=[${MULTILIB_USEDEP}]
57 51
	sys-apps/attr[${MULTILIB_USEDEP}]
58
	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
59
	<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
52
	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
53
	<sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
60 54
	sys-libs/libcap
61 55
	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
62 56
	sys-libs/readline:0=
63
	>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
64
	>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
65
	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
57
	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
58
	>=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
59
	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
66 60
	sys-libs/zlib[${MULTILIB_USEDEP}]
67 61
	virtual/libiconv
68 62
	pam? ( virtual/pam )
69 63
	acl? ( virtual/acl )
70
	addns? ( net-dns/bind-tools[gssapi] )
64
	addns? (
65
		net-dns/bind-tools[gssapi]
66
		dev-python/dnspython:=[${PYTHON_USEDEP}]
67
	)
68
	ceph? ( sys-cluster/ceph )
71 69
	cluster? (
72 70
		net-libs/rpcsvc-proto
73 71
		!dev-db/ctdb
74 72
	)
75 73
	cups? ( net-print/cups )
74
	debug? ( dev-util/lttng-ust )
76 75
	dmapi? ( sys-apps/dmapi )
77 76
	fam? ( virtual/fam )
78 77
	gnutls? (
......
82 81
	gpg? ( app-crypt/gpgme )
83 82
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
84 83
	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
85
	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
86
	systemd? ( sys-apps/systemd:0= )"
84
	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
85
	systemd? ( sys-apps/systemd:0= )
86
"
87 87
DEPEND="${CDEPEND}
88
	${PYTHON_DEPS}
88 89
	app-text/docbook-xsl-stylesheets
89 90
	dev-libs/libxslt
90 91
	virtual/pkgconfig
92
	net-libs/libtirpc[${MULTILIB_USEDEP}]
93
	|| (
94
		net-libs/rpcsvc-proto
95
		<sys-libs/glibc-2.26[rpc(+)]
96
	)
91 97
	test? (
92
		>=sys-libs/nss_wrapper-1.1.3
93
		>=net-dns/resolv_wrapper-1.1.4
94
		>=net-libs/socket_wrapper-1.1.7
95
		>=sys-libs/uid_wrapper-1.2.1
98
		!system-mitkrb5? (
99
			>=sys-libs/nss_wrapper-1.1.3
100
			>=net-dns/resolv_wrapper-1.1.4
101
			>=net-libs/socket_wrapper-1.1.7
102
			>=sys-libs/uid_wrapper-1.2.1
103
		)
96 104
	)"
97 105
RDEPEND="${CDEPEND}
106
	python? ( ${PYTHON_DEPS} )
98 107
	client? ( net-fs/cifs-utils[ads?] )
99 108
	selinux? ( sec-policy/selinux-samba )
100 109
	!dev-perl/Parse-Yapp
101 110
"
102 111

  
103 112
REQUIRED_USE="
104
	addc? ( gnutls !system-mitkrb5 )
113
	addc? ( python gnutls )
114
	addns? ( python )
105 115
	ads? ( acl gnutls ldap )
106 116
	cluster? ( ads )
107 117
	gpg? ( addc )
118
	test? ( python )
108 119
	?? ( system-heimdal system-mitkrb5 )
109
	${PYTHON_REQUIRED_USE}"
120
	${PYTHON_REQUIRED_USE}
121
"
122

  
123
# the test suite is messed, it uses system-installed samba
124
# bits instead of what was built, tests things disabled via use
125
# flags, and generally just fails to work in a way ebuilds could
126
# rely on in its current state
127
RESTRICT="test"
110 128

  
111 129
S="${WORKDIR}/${MY_P}"
112 130

  
113 131
PATCHES=(
114 132
	"${FILESDIR}/${PN}-4.4.0-pam.patch"
115 133
	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
116
	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
134
	"${FILESDIR}"/talloc-disable-python.patch
135
	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
117 136
)
118 137

  
119 138
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
......
135 154
src_prepare() {
136 155
	default
137 156

  
138
	# install the patches from tarball(s)
139
	eapply "${WORKDIR}/patches"
157
	# un-bundle dnspython
158
	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
159

  
160
	# unbundle iso8601 unless tests are enabled
161
	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
140 162

  
141 163
	# ugly hackaround for bug #592502
142 164
	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
......
164 186
		--localstatedir="${EPREFIX}/var"
165 187
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
166 188
		--with-piddir="${EPREFIX}/run/${PN}"
167
		--without-lttng
168 189
		--bundled-libraries="${bundled_libs}"
169 190
		--builtin-libraries=NONE
170 191
		--disable-rpath
171 192
		--disable-rpath-install
172 193
		--nopyc
173 194
		--nopyo
174
		--disable-cephfs
175 195
	)
176 196
	if multilib_is_native_abi ; then
177 197
		myconf+=(
......
179 199
			$(usex addc '' '--without-ad-dc')
180 200
			$(use_with addns dnsupdate)
181 201
			$(use_with ads)
202
			$(use_enable ceph cephfs)
182 203
			$(use_with cluster cluster-support)
183 204
			$(use_enable cups)
205
			$(use_with debug lttng)
184 206
			$(use_with dmapi)
185 207
			$(use_with fam)
186 208
			$(use_enable gnutls)
......
194 216
			$(use_with systemd)
195 217
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
196 218
			$(use_with winbind)
219
			$(usex python '' '--disable-python')
197 220
			$(usex test '--enable-selftest' '')
198 221
			$(use_enable zeroconf avahi)
199 222
			--with-shared-modules=${SHAREDMODS}
......
205 228
			--without-dnsupdate
206 229
			--without-ads
207 230
			--disable-avahi
231
			--disable-cephfs
208 232
			--without-cluster-support
209 233
			--disable-cups
210 234
			--without-dmapi
......
213 237
			--without-gpgme
214 238
			--disable-iprint
215 239
			$(use_with ldap)
240
			$(use_with debug lttng)
216 241
			--without-pam
217 242
			--without-quotas
218 243
			--without-syslog
......
273 298
		systemd_dounit "${FILESDIR}"/winbindd.service
274 299
		systemd_dounit "${FILESDIR}"/samba.service
275 300
	fi
301

  
302
	if use pam && use winbind ; then
303
		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
304
		# bugs #376853 and #590374
305
		insinto /etc/security
306
		doins examples/pam_winbind/pam_winbind.conf || die
307
	fi
308

  
309
	keepdir /var/cache/samba
310
	keepdir /var/lib/ctdb
311
	keepdir /var/lib/samba/{bind-dns,private}
312
	keepdir /var/lock/samba
313
	keepdir /var/log/samba
314
	keepdir /var/run/{ctdb,samba}
276 315
}
277 316

  
278 317
multilib_src_test() {
Thank you!