Skip to content

Commit aaed8d7

Browse files
sayanchowdhurydongsupark
authored andcommitted
net-fs/samba: Sync with Gentoo
It's from Gentoo commit 80dfa8a735c57c3d7da903b1e79244df305ad3fd.
1 parent 0a0cfb8 commit aaed8d7

File tree

2 files changed

+11
-34
lines changed

2 files changed

+11
-34
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246
1+
DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c

sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.18.8.ebuild renamed to sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.18.9.ebuild

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# Copyright 1999-2023 Gentoo Authors
1+
# Copyright 1999-2024 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=8
55

66
PYTHON_COMPAT=( python3_{10..11} )
77
PYTHON_REQ_USE="threads(+),xml(+)"
8-
TMPFILES_OPTIONAL=1
98
inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
109

1110
DESCRIPTION="Samba Suite Version 4"
@@ -14,9 +13,9 @@ HOMEPAGE="https://samba.org/"
1413
MY_PV="${PV/_rc/rc}"
1514
MY_P="${PN}-${MY_PV}"
1615
if [[ ${PV} == *_rc* ]]; then
17-
SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
16+
SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
1817
else
19-
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
18+
SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
2019
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
2120
fi
2221
S="${WORKDIR}/${MY_P}"
@@ -27,7 +26,6 @@ IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterf
2726
IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
2827
IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
2928
IUSE+=" zeroconf"
30-
IUSE+=" +minimal" # Flatcar: Only install libraries, not executables.
3129

3230
REQUIRED_USE="${PYTHON_REQUIRED_USE}
3331
addc? ( json python !system-mitkrb5 winbind )
@@ -61,13 +59,14 @@ TALLOC_VERSION="2.4.0"
6159
TDB_VERSION="1.4.8"
6260
TEVENT_VERSION="0.14.1"
6361

64-
# Flatcar: exclude perl, icu, libtasn1, Parse-Yapp from DEPEND
6562
COMMON_DEPEND="
6663
>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
67-
spotlight? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
64+
dev-lang/perl:=
65+
dev-libs/icu:=[${MULTILIB_USEDEP}]
6866
dev-libs/libbsd[${MULTILIB_USEDEP}]
69-
!minimal? ( dev-libs/libtasn1:=[${MULTILIB_USEDEP}] )
67+
dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
7068
dev-libs/popt[${MULTILIB_USEDEP}]
69+
dev-perl/Parse-Yapp
7170
>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
7271
>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
7372
>=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}]
@@ -118,9 +117,8 @@ COMMON_DEPEND="
118117
)
119118
zeroconf? ( net-dns/avahi[dbus] )
120119
"
121-
# Flatcar: pull in JSON only if json is enabled
122120
DEPEND="${COMMON_DEPEND}
123-
json? ( dev-perl/JSON )
121+
dev-perl/JSON
124122
net-libs/libtirpc[${MULTILIB_USEDEP}]
125123
net-libs/rpcsvc-proto
126124
spotlight? ( dev-libs/glib )
@@ -140,8 +138,6 @@ RDEPEND="${COMMON_DEPEND}
140138
selinux? ( sec-policy/selinux-samba )
141139
"
142140
BDEPEND="${PYTHON_DEPS}
143-
dev-lang/perl:=
144-
dev-perl/Parse-Yapp
145141
app-text/docbook-xsl-stylesheets
146142
dev-libs/libxslt
147143
virtual/pkgconfig
@@ -252,10 +248,6 @@ multilib_src_configure() {
252248
EOF
253249
fi
254250

255-
# Flatcar: we need only the mandatory bundled library, ldb by default.
256-
# Without that, configure will fail because of a missing bundled library.
257-
bundled_libs="ldb"
258-
259251
local myconf=(
260252
--enable-fhs
261253
--sysconfdir="${EPREFIX}/etc"
@@ -366,8 +358,7 @@ multilib_src_install() {
366358
newinitd "${CONFDIR}/samba4.initd-r1" samba
367359
newconfd "${CONFDIR}/samba4.confd" samba
368360

369-
# Flatcar: do not create samba config if minimal enabled
370-
use minimal || dotmpfiles "${FILESDIR}"/samba.conf
361+
dotmpfiles "${FILESDIR}"/samba.conf
371362
if ! use addc ; then
372363
rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
373364
|| die
@@ -385,22 +376,8 @@ multilib_src_install() {
385376
insinto /etc/security
386377
doins examples/pam_winbind/pam_winbind.conf
387378
fi
388-
389-
# Flatcar: clean up unnecessary files
390-
rm -f "${ED%/}"/etc/samba/*
391-
rm -f "${ED%/}"/usr/lib*/samba/ldb/*
392-
if use minimal ; then
393-
mv "${ED%/}"/usr/bin/net "${T}"/
394-
rm -f "${ED%/}"/usr/bin/* "${ED%/}"/usr/sbin/*
395-
mv "${T}"/net "${ED%/}"/usr/bin/net
396-
rm -rf ${ED%/}/lib*/security
397-
rm -rf ${ED%/}/usr/lib/systemd
398-
rm -rf ${ED%/}/usr/lib*/perl*
399-
rm -rf ${ED%/}/usr/lib*/python*
400-
rm -rf ${ED%/}/var
401-
fi
402379
}
403380

404381
pkg_postinst() {
405-
use minimal || tmpfiles_process samba.conf
382+
tmpfiles_process samba.conf
406383
}

0 commit comments

Comments
 (0)