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