Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
Date: Fri, 03 Dec 2021 13:00:27
Message-Id: 1638536406.f7a1b09d9fa27e63e1867f470f5f5702a083b866.polynomial-c@gentoo
1 commit: f7a1b09d9fa27e63e1867f470f5f5702a083b866
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 3 12:59:40 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 3 13:00:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a1b09d
7
8 net-fs/samba: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 net-fs/samba/Manifest | 1 -
13 net-fs/samba/samba-4.15.1.ebuild | 336 ---------------------------------------
14 2 files changed, 337 deletions(-)
15
16 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
17 index 1243c746214d..0bd4d0b090de 100644
18 --- a/net-fs/samba/Manifest
19 +++ b/net-fs/samba/Manifest
20 @@ -1,4 +1,3 @@
21 DIST samba-4.14.10.tar.gz 19134066 BLAKE2B c6daebc7abbf2ed371ed694e4478d05875d55f7c5a9f83461932eebd7fe9089ff15e0530555d468e64f897d4cadab86e8c0acbfbd20938b3be842cb4324486e2 SHA512 0e1dd386d185cf77a2be4155646e98b3218316b5c290358684ec8eed747ffea67aa7db0937edc971fb791dc47f0f51306db33eb3b8cb65cca8787f18fd4b7f1c
22 DIST samba-4.14.9.tar.gz 19063803 BLAKE2B 157665aba6d2449781ad3781deb2cdb3ae325879a796b8ba07a9d981ed93aaccd7f098841136a3be9d4e304ecba00b7ecb0c4a84cdfc6593172d4bc66cb38c69 SHA512 e7eb8b55656f51d94d99358dbe39869a74e34b2c69e14ac813c2387a4b2a10d8a5c22ad9b6a3a3ed4dcec4c13df810f577e22d7f1cc903176c0962e412496deb
23 -DIST samba-4.15.1.tar.gz 19192249 BLAKE2B 1348e1fd8ba69c2b4d9a70418805c4a893d2198d8571d4ee66953b8326cb18245f54053eb873accf59b82edb5ee82305f4933451ce35842e598863bc1d54040c SHA512 caa6365f26b2b19c96732252b4f8446e82a1f12f08e4ad7803709d8a10b9cc4f1075723f0249419f387b2a8de9020f68cbf0ca780f0e56efbe11fb7ddb32ebf6
24 DIST samba-4.15.2.tar.gz 19252338 BLAKE2B aded33cbefce69c9b20148de1be224514de5cc825404e8188fb0a96022d0fdc6595256f74a5e295fd2e1062e8520775b6c59c1d6a7bf80a52ed9fa9db412dcdd SHA512 6fdf9db0da90332afe527703066cca4ec5b0ec6bf6a5979443953f9fbc18b870a7e2445a41c9ae3d63f7738c9c0282e7ca82f6066aa68e151eec248615ea7b21
25
26 diff --git a/net-fs/samba/samba-4.15.1.ebuild b/net-fs/samba/samba-4.15.1.ebuild
27 deleted file mode 100644
28 index eb4a6d3662cd..000000000000
29 --- a/net-fs/samba/samba-4.15.1.ebuild
30 +++ /dev/null
31 @@ -1,336 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{8..10} )
38 -PYTHON_REQ_USE="threads(+),xml(+)"
39 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
40 -
41 -DESCRIPTION="Samba Suite Version 4"
42 -HOMEPAGE="https://samba.org/"
43 -
44 -MY_PV="${PV/_rc/rc}"
45 -MY_P="${PN}-${MY_PV}"
46 -if [[ ${PV} = *_rc* ]]; then
47 - SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
48 -else
49 - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
50 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
51 -fi
52 -S="${WORKDIR}/${MY_P}"
53 -
54 -LICENSE="GPL-3"
55 -SLOT="0"
56 -IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
57 -gpg iprint json ldap pam profiling-data python quota +regedit selinux
58 -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
59 -zeroconf"
60 -
61 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
62 - addc? ( python json winbind )
63 - ads? ( acl ldap python winbind )
64 - cluster? ( ads )
65 - gpg? ( addc )
66 - spotlight? ( json )
67 - test? ( python )
68 - !ads? ( !addc )
69 - ?? ( system-heimdal system-mitkrb5 )
70 -"
71 -
72 -# the test suite is messed, it uses system-installed samba
73 -# bits instead of what was built, tests things disabled via use
74 -# flags, and generally just fails to work in a way ebuilds could
75 -# rely on in its current state
76 -RESTRICT="test"
77 -
78 -MULTILIB_WRAPPED_HEADERS=(
79 - /usr/include/samba-4.0/policy.h
80 - /usr/include/samba-4.0/dcerpc_server.h
81 - /usr/include/samba-4.0/ctdb.h
82 - /usr/include/samba-4.0/ctdb_client.h
83 - /usr/include/samba-4.0/ctdb_protocol.h
84 - /usr/include/samba-4.0/ctdb_private.h
85 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
86 - /usr/include/samba-4.0/ctdb_version.h
87 -)
88 -
89 -COMMON_DEPEND="
90 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
91 - dev-lang/perl:=
92 - dev-libs/icu:=[${MULTILIB_USEDEP}]
93 - dev-libs/libbsd[${MULTILIB_USEDEP}]
94 - dev-libs/libtasn1[${MULTILIB_USEDEP}]
95 - dev-libs/popt[${MULTILIB_USEDEP}]
96 - dev-perl/Parse-Yapp
97 - >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
98 - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
99 - >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
100 - <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
101 - sys-libs/libcap[${MULTILIB_USEDEP}]
102 - sys-libs/liburing:=[${MULTILIB_USEDEP}]
103 - sys-libs/ncurses:0=
104 - sys-libs/readline:0=
105 - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
106 - >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
107 - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
108 - sys-libs/zlib[${MULTILIB_USEDEP}]
109 - virtual/libcrypt:=[${MULTILIB_USEDEP}]
110 - virtual/libiconv
111 - $(python_gen_cond_dep "
112 - addc? (
113 - dev-python/dnspython:=[\${PYTHON_USEDEP}]
114 - dev-python/markdown[\${PYTHON_USEDEP}]
115 - )
116 - ads? (
117 - dev-python/dnspython:=[\${PYTHON_USEDEP}]
118 - net-dns/bind-tools[gssapi]
119 - )
120 - ")
121 - !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
122 - acl? ( virtual/acl )
123 - ceph? ( sys-cluster/ceph )
124 - cluster? ( net-libs/rpcsvc-proto )
125 - cups? ( net-print/cups )
126 - debug? ( dev-util/lttng-ust )
127 - dmapi? ( sys-apps/dmapi )
128 - fam? ( virtual/fam )
129 - gpg? ( app-crypt/gpgme )
130 - json? ( dev-libs/jansson:= )
131 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
132 - pam? ( sys-libs/pam )
133 - python? (
134 - sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
135 - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
136 - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
137 - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
138 - )
139 - snapper? ( sys-apps/dbus )
140 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
141 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
142 - systemd? ( sys-apps/systemd:0= )
143 - zeroconf? ( net-dns/avahi[dbus] )
144 -"
145 -DEPEND="${COMMON_DEPEND}
146 - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
147 - net-libs/libtirpc[${MULTILIB_USEDEP}]
148 - || (
149 - net-libs/rpcsvc-proto
150 - <sys-libs/glibc-2.26[rpc(+)]
151 - )
152 - spotlight? ( dev-libs/glib )
153 - test? (
154 - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
155 - !system-mitkrb5? (
156 - >=net-dns/resolv_wrapper-1.1.4
157 - >=net-libs/socket_wrapper-1.1.9
158 - >=sys-libs/nss_wrapper-1.1.3
159 - >=sys-libs/uid_wrapper-1.2.1
160 - )
161 - )"
162 -RDEPEND="${COMMON_DEPEND}
163 - client? ( net-fs/cifs-utils[ads?] )
164 - python? ( ${PYTHON_DEPS} )
165 - selinux? ( sec-policy/selinux-samba )
166 -"
167 -BDEPEND="${PYTHON_DEPS}
168 - app-text/docbook-xsl-stylesheets
169 - dev-libs/libxslt
170 - virtual/pkgconfig
171 -"
172 -
173 -PATCHES=(
174 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
175 -)
176 -
177 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
178 -CONFDIR="${FILESDIR}/4.4"
179 -
180 -WAF_BINARY="${S}/buildtools/bin/waf"
181 -
182 -SHAREDMODS=""
183 -
184 -pkg_setup() {
185 - # Package fails to build with distcc
186 - export DISTCC_DISABLE=1
187 -
188 - python-single-r1_pkg_setup
189 -
190 - SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
191 - if use cluster ; then
192 - SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
193 - elif use ads ; then
194 - SHAREDMODS+=",idmap_ad"
195 - fi
196 -}
197 -
198 -src_prepare() {
199 - default
200 -
201 - # un-bundle dnspython
202 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
203 -
204 - # unbundle iso8601 unless tests are enabled
205 - if ! use test ; then
206 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
207 - fi
208 -
209 - ## ugly hackaround for bug #592502
210 - #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
211 -
212 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
213 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
214 - || die
215 -
216 - # Friggin' WAF shit
217 - multilib_copy_sources
218 -}
219 -
220 -multilib_src_configure() {
221 - # when specifying libs for samba build you must append NONE to the end to
222 - # stop it automatically including things
223 - local bundled_libs="NONE"
224 - if ! use system-heimdal && ! use system-mitkrb5 ; then
225 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
226 - fi
227 -
228 - local myconf=(
229 - --enable-fhs
230 - --sysconfdir="${EPREFIX}/etc"
231 - --localstatedir="${EPREFIX}/var"
232 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
233 - --with-piddir="${EPREFIX}/run/${PN}"
234 - --bundled-libraries="${bundled_libs}"
235 - --builtin-libraries=NONE
236 - --disable-rpath
237 - --disable-rpath-install
238 - --nopyc
239 - --nopyo
240 - --without-winexe
241 - $(multilib_native_use_with acl acl-support)
242 - $(multilib_native_usex addc '' '--without-ad-dc')
243 - $(multilib_native_use_with ads)
244 - $(multilib_native_use_enable ceph cephfs)
245 - $(multilib_native_use_with cluster cluster-support)
246 - $(multilib_native_use_enable cups)
247 - $(multilib_native_use_with dmapi)
248 - $(multilib_native_use_with fam)
249 - $(multilib_native_use_enable glusterfs)
250 - $(multilib_native_use_with gpg gpgme)
251 - $(multilib_native_use_with json)
252 - $(multilib_native_use_enable iprint)
253 - $(multilib_native_use_with pam)
254 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
255 - $(multilib_native_use_with quota quotas)
256 - $(multilib_native_use_with regedit)
257 - $(multilib_native_use_enable spotlight)
258 - $(multilib_native_use_with syslog)
259 - $(multilib_native_use_with systemd)
260 - --systemd-install-services
261 - --with-systemddir="$(systemd_get_systemunitdir)"
262 - $(multilib_native_use_with winbind)
263 - $(multilib_native_usex python '' '--disable-python')
264 - $(multilib_native_use_enable zeroconf avahi)
265 - $(multilib_native_usex test '--enable-selftest' '')
266 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
267 - $(use_with debug lttng)
268 - $(use_with ldap)
269 - $(use_with profiling-data)
270 - # bug #683148
271 - --jobs 1
272 - )
273 -
274 - if multilib_is_native_abi ; then
275 - myconf+=( --with-shared-modules=${SHAREDMODS} )
276 - else
277 - myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
278 - fi
279 -
280 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
281 - waf-utils_src_configure ${myconf[@]}
282 -}
283 -
284 -multilib_src_compile() {
285 - waf-utils_src_compile
286 -}
287 -
288 -multilib_src_install() {
289 - waf-utils_src_install
290 -
291 - # Make all .so files executable
292 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
293 -
294 - if multilib_is_native_abi ; then
295 - # install ldap schema for server (bug #491002)
296 - if use ldap ; then
297 - insinto /etc/openldap/schema
298 - doins examples/LDAP/samba.schema
299 - fi
300 -
301 - # create symlink for cups (bug #552310)
302 - if use cups ; then
303 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
304 - fi
305 -
306 - # install example config file
307 - insinto /etc/samba
308 - doins examples/smb.conf.default
309 -
310 - # Fix paths in example file (#603964)
311 - sed \
312 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
313 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
314 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
315 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
316 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
317 - -i "${ED}"/etc/samba/smb.conf.default || die
318 -
319 - # Install init script and conf.d file
320 - newinitd "${CONFDIR}/samba4.initd-r1" samba
321 - newconfd "${CONFDIR}/samba4.confd" samba
322 -
323 - dotmpfiles "${FILESDIR}"/samba.conf
324 - use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
325 -
326 - # Preserve functionality for old gentoo-specific unit names
327 - dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
328 - dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
329 - dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
330 - fi
331 -
332 - if use pam && use winbind ; then
333 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
334 - # bugs #376853 and #590374
335 - insinto /etc/security
336 - doins examples/pam_winbind/pam_winbind.conf
337 - fi
338 -
339 - keepdir /var/cache/samba
340 - keepdir /var/lib/ctdb
341 - keepdir /var/lib/samba/{bind-dns,private}
342 - keepdir /var/lock/samba
343 - keepdir /var/log/samba
344 -}
345 -
346 -multilib_src_test() {
347 - if multilib_is_native_abi ; then
348 - "${WAF_BINARY}" test || die "test failed"
349 - fi
350 -}
351 -
352 -pkg_postinst() {
353 - tmpfiles_process samba.conf
354 -
355 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
356 - elog "Be aware that this release contains the best of all of Samba's"
357 - elog "technology parts, both a file server (that you can reasonably expect"
358 - elog "to upgrade existing Samba 3.x releases to) and the AD domain"
359 - elog "controller work previously known as 'samba4'."
360 - elog
361 - fi
362 - if [[ "${PV}" != *_rc* ]] ; then
363 - elog "For further information and migration steps make sure to read "
364 - elog "https://samba.org/samba/history/${P}.html "
365 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
366 - fi
367 -}