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