* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2016-01-05 22:58 Victor Ostorga
0 siblings, 0 replies; 17+ messages in thread
From: Victor Ostorga @ 2016-01-05 22:58 UTC (permalink / raw
To: gentoo-commits
commit: f4742df3950c9b9c36a1f059be36833ce84d1aff
Author: Victor Ostorga <vostorga <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 22:52:05 2016 +0000
Commit: Victor Ostorga <vostorga <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 22:54:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4742df3
Fixing automagic dependency on pam, bug #489770
Package-Manager: portage-2.2.24
net-fs/samba/files/samba-4.2.7-pam.patch | 36 ++++++++++++++++++++++++++++++++
net-fs/samba/samba-4.2.7.ebuild | 16 ++++----------
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/net-fs/samba/files/samba-4.2.7-pam.patch b/net-fs/samba/files/samba-4.2.7-pam.patch
new file mode 100644
index 0000000..0777bae
--- /dev/null
+++ b/net-fs/samba/files/samba-4.2.7-pam.patch
@@ -0,0 +1,36 @@
+--- /tmp/samba-4.2.7/source3/wscript 2015-07-14 12:54:24.000000000 +0200
++++ source3/wscript 2016-01-05 22:48:50.669250837 +0100
+@@ -853,11 +853,11 @@
+ if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
+ conf.env.with_iconv = False
+ if conf.env.with_iconv:
+ conf.DEFINE('HAVE_ICONV', 1)
+
+- if Options.options.with_pam:
++ if Options.options.with_pam != False:
+ use_pam=True
+ conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
+ if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
+ Logs.warn("--with-pam=yes but pam_appl.h not found")
+ use_pam=False
+@@ -926,10 +926,20 @@
+ msg="Checking whether PAM_RADIO_TYPE is available");
+ if use_pam:
+ conf.DEFINE('WITH_PAM', 1)
+ conf.DEFINE('WITH_PAM_MODULES', 1)
+
++ else:
++ Logs.warn("PAM disabled")
++ use_pam=False
++ conf.undefine('WITH_PAM')
++ conf.undefine('WITH_PAM_MODULES')
++ conf.undefine('HAVE_SECURITY_PAM_APPL_H')
++ conf.undefine('PAM_RHOST')
++ conf.undefine('PAM_TTY')
++ conf.undefine('HAVE_PAM_PAM_APPL_H')
++
+ if Options.options.with_pam_smbpass:
+ conf.env.with_pam_smbpass = True
+
+ seteuid = False
+
diff --git a/net-fs/samba/samba-4.2.7.ebuild b/net-fs/samba/samba-4.2.7.ebuild
index 70ac968..170e737 100644
--- a/net-fs/samba/samba-4.2.7.ebuild
+++ b/net-fs/samba/samba-4.2.7.ebuild
@@ -28,7 +28,6 @@ IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
CDEPEND="${PYTHON_DEPS}
dev-libs/iniparser:0
dev-libs/popt
@@ -47,7 +46,6 @@ CDEPEND="${PYTHON_DEPS}
>=sys-libs/tevent-0.9.25
>=sys-libs/uid_wrapper-1.0.1
sys-libs/zlib
- virtual/pam
acl? ( virtual/acl )
addns? ( net-dns/bind-tools[gssapi] )
aio? ( dev-libs/libaio )
@@ -60,7 +58,8 @@ CDEPEND="${PYTHON_DEPS}
ldap? ( net-nds/openldap )
system-mitkrb5? ( app-crypt/mit-krb5 )
!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
- systemd? ( sys-apps/systemd:0= )"
+ systemd? ( sys-apps/systemd:0= )
+ pam? ( virtual/pam )"
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
@@ -74,7 +73,8 @@ REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" \
+ "${FILESDIR}/${PN}-4.2.7-pam.patch")
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -94,14 +94,6 @@ pkg_setup() {
ewarn "and recompile your kernel..."
fi
fi
- if ! use pam ; then
- ewarn "You have pam USE flag disabled!"
- ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream"
- ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being"
- ewarn "found on the sytem."
- ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-"
- ewarn "cation modules."
- fi
}
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2016-01-13 22:40 Ian Stakenvicius
0 siblings, 0 replies; 17+ messages in thread
From: Ian Stakenvicius @ 2016-01-13 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 9b06d193e2364840d6316cd4dee2e475a05d1785
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 22:39:14 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 22:39:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b06d193
net-fs/samba: split up altabi patches and tarball them
Package-Manager: portage-2.2.26
net-fs/samba/Manifest | 2 +
.../samba-4.2.7-disable-python-for-altabi.patch | 823 --------------------
.../samba-4.3.3-disable-python-for-altabi.patch | 826 ---------------------
net-fs/samba/samba-4.2.7-r1.ebuild | 10 +-
net-fs/samba/samba-4.3.3-r1.ebuild | 10 +-
net-fs/samba/samba-4.3.4.ebuild | 12 +-
6 files changed, 27 insertions(+), 1656 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index cefb565..6c62fa1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,4 +4,6 @@ DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b
DIST samba-4.2.7.tar.gz 20741971 SHA256 f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a SHA512 74314083c04689696f0423bc990947bfafad679edcac97e6c137e99c17de1e262a4d8450b57de733a70c86c746300c7c5a1365b56c0e353ce79b05e0baf8eb9a WHIRLPOOL 84e7d2f3a60701ee929198caf86371c9e1694be6def47a4f0f12d4d221b995209505c23564c304fbdd95ab5ae528f941946bd361ec6e388f7ba4db08792ff3ba
DIST samba-4.3.3.tar.gz 20427281 SHA256 e62d21313acbb29e24b0b80aaf2b63fdd1ccce4cfb741f333deca95a1a3a70df SHA512 2c66d97f543e22a25ff77481359e7c69817d97c20b77a3ab02a1aab415e0b8a9a6024f4466abcca8312979f9b26596e016ca5bb78ccfe3746e3e9cec0fa303be WHIRLPOOL dae3cbe3aebd0aa70a726b4946470829b703f30c0aaf59f9ae094e7f4dfa25b0573e6c49690d91308f3dddc25cf6fbf0b1341da33446dc4ee29a115db48f9604
DIST samba-4.3.4.tar.gz 20434434 SHA256 5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9 SHA512 021351534a70cd351934d7f8bfc3c4e9ed9ea3f11f778f6f9d076b3368103f7f478ff1745cb257de0bf2ee38ae76ecba58e01a4db6cbcacbd8a4876e8e1b30f2 WHIRLPOOL 328721951ed932c5813d6157ca2933e22adb793d5cd6667577e40151bcdae8dcddf5ca4e053cd6494e0f82f5801ae480716520c625dd9c337557abc168e00dec
+DIST samba-disable-python-patches-4.2.7.tar.xz 6296 SHA256 06a1b9aeb91b622d3c2a02a86edfc26e26f10303699c8b2badbd21ce68b10ec0 SHA512 ff746c2969b254d9ccad1440699fccd5958222eea8284a8e068b96df377d6cea8551ec3c6be7103cebf227b0b9038a5b06d3b06d9b247e181403e9fe1ad7eedf WHIRLPOOL 8ea9f34c5f011624b43c0f3f27601574c27e00c5a728d9af5b1cece090da362d51f93ef6cecd37f1204bbd4e608ed58027f52ef5c3d700a1cfdbbb0e5355c3b8
+DIST samba-disable-python-patches-4.3.3.tar.xz 6016 SHA256 00debe6c5cc57b87150ded67db8dc54e5ec487f6ed610c96e8fa393743c47f66 SHA512 775abcee86690605e156f4c560f25d762f5cc2e72177a55003ad5124ed643322f2c84514342ed0eadad2c8e1ea97006bc6ce7d504ca8a29c27a201666ce4bdf6 WHIRLPOOL 86c40669e706f6c3b955e6fb892931532e241dd92cae2e7b5986e78f6b5fe50c42c019b97650942de81c8c4989568bcb93e49a7bcb2f9fd300d189da5fa08fe4
DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/files/samba-4.2.7-disable-python-for-altabi.patch b/net-fs/samba/files/samba-4.2.7-disable-python-for-altabi.patch
deleted file mode 100644
index c05aa17..0000000
--- a/net-fs/samba/files/samba-4.2.7-disable-python-for-altabi.patch
+++ /dev/null
@@ -1,823 +0,0 @@
---- a/auth/credentials/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/auth/credentials/wscript_build 2016-01-08 19:50:12.510297249 -0500
-@@ -24,7 +24,8 @@
- source='credentials_ntlm.c',
- deps='samba-credentials')
-
--bld.SAMBA_PYTHON('pycredentials',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pycredentials',
- source='pycredentials.c',
- public_deps='samba-credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
- realname='samba/credentials.so'
---- a/lib/ldb/wscript 2015-12-10 04:20:09.000000000 -0500
-+++ b/lib/ldb/wscript 2016-01-08 19:50:12.450297496 -0500
-@@ -34,6 +34,8 @@
- conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/tevent')
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- if conf.CHECK_FOR_THIRD_PARTY():
- conf.RECURSE('third_party/popt')
- else:
-@@ -47,7 +49,8 @@
- conf.find_program('xsltproc', var='XSLTPROC')
- conf.check_tool('python')
- conf.check_python_version((2,4,2))
-- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+ if not conf.env.disable_python:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-
- # where does the default LIBDIR end up? in conf.env somewhere?
- #
-@@ -60,7 +63,7 @@
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=SYSTEM_VERSION,
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=SYSTEM_VERSION,
- onlyif='talloc tdb tevent ldb',
- implied_deps='replace talloc tdb tevent ldb'):
- conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
-@@ -121,8 +124,9 @@
- bld.env.PACKAGE_VERSION = VERSION
- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-
-- if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
-- bld.SAMBA_LIBRARY('pyldb-util',
-+ if not bld.env.disable_python:
-+ if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
-+ bld.SAMBA_LIBRARY('pyldb-util',
- deps='ldb',
- source='pyldb_util.c',
- public_headers='pyldb.h',
---- a/lib/ntdb/wscript 2014-10-01 04:12:21.000000000 -0400
-+++ b/lib/ntdb/wscript 2016-01-08 19:50:12.460297455 -0500
-@@ -109,7 +109,7 @@
- if conf.CHECK_BUNDLED_SYSTEM('ntdb', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_NTDB', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pyntdb', 'ntdb', minversion=VERSION):
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pyntdb', 'ntdb', minversion=VERSION):
- conf.define('USING_SYSTEM_PYNTDB', 1)
-
- if not conf.env.disable_python:
---- a/lib/talloc/wscript 2015-04-15 15:27:33.000000000 -0400
-+++ b/lib/talloc/wscript 2016-01-08 19:50:12.470297414 -0500
-@@ -47,7 +47,7 @@
- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TALLOC', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
- implied_deps='talloc replace'):
- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
-
---- a/lib/tdb/wscript 2015-07-14 06:54:24.000000000 -0400
-+++ b/lib/tdb/wscript 2016-01-08 19:50:12.480297372 -0500
-@@ -81,7 +81,7 @@
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TDB', 1)
- conf.env.building_tdb = False
-- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
- conf.define('USING_SYSTEM_PYTDB', 1)
-
- conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-@@ -178,8 +178,9 @@
- bld.SAMBA_BINARY(b, s, 'replace tdb-test-helpers',
- includes='include', install=False)
-
-- if not bld.CONFIG_SET('USING_SYSTEM_PYTDB'):
-- bld.SAMBA_PYTHON('pytdb',
-+ if not bld.env.disable_python:
-+ if not bld.CONFIG_SET('USING_SYSTEM_PYTDB'):
-+ bld.SAMBA_PYTHON('pytdb',
- 'pytdb.c',
- deps='tdb',
- enabled=not bld.env.disable_python,
---- a/lib/tevent/wscript 2015-07-14 06:54:24.000000000 -0400
-+++ b/lib/tevent/wscript 2016-01-08 19:50:12.500297290 -0500
-@@ -34,11 +34,13 @@
-
- conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- if not conf.env.standalone_tevent:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
- onlyif='talloc', implied_deps='replace talloc'):
- conf.define('USING_SYSTEM_TEVENT', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
- conf.define('USING_SYSTEM_PYTEVENT', 1)
-
- if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
-@@ -61,8 +63,6 @@
- if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'):
- conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals)
-
-- conf.env.disable_python = getattr(Options.options, 'disable_python', False)
--
- if not conf.env.disable_python:
- # also disable if we don't have the python libs installed
- conf.find_program('python', var='PYTHON')
---- a/libcli/nbt/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/libcli/nbt/wscript_build 2016-01-08 19:50:12.520297208 -0500
-@@ -24,7 +24,8 @@
- install=False
- )
-
--bld.SAMBA_PYTHON('python_netbios',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_netbios',
- source='pynbt.c',
- public_deps='cli-nbt DYNCONFIG samba-hostconfig',
- realname='samba/netbios.so'
---- a/libcli/security/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/libcli/security/wscript_build 2016-01-08 19:50:12.530297167 -0500
-@@ -7,7 +7,8 @@
- deps='talloc ndr NDR_SECURITY'
- )
-
--bld.SAMBA_PYTHON('pysecurity',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pysecurity',
- source='pysecurity.c',
- deps='samba-security pytalloc-util',
- realname='samba/security.so'
---- a/python/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/python/wscript_build 2016-01-08 19:50:12.800296055 -0500
-@@ -1,13 +1,14 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba_python',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba_python',
- source=[],
- deps='LIBPYTHON pytalloc-util pyrpc_util',
- grouping_library=True,
- private_library=True,
- pyembed=True)
-
--bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-+ bld.SAMBA_SUBSYSTEM('LIBPYTHON',
- source='modules.c',
- public_deps='',
- init_function_sentinel='{NULL,NULL}',
-@@ -15,8 +16,7 @@
- pyext=True,
- )
-
--
--bld.SAMBA_PYTHON('python_uuid',
-+ bld.SAMBA_PYTHON('python_uuid',
- source='uuidmodule.c',
- deps='ndr',
- realname='uuid.so',
-@@ -24,7 +24,7 @@
- )
-
-
--bld.SAMBA_PYTHON('python_glue',
-+ bld.SAMBA_PYTHON('python_glue',
- source='pyglue.c',
- deps='pyparam_util samba-util netif pytalloc-util',
- realname='samba/_glue.so'
-@@ -32,8 +32,8 @@
-
-
- # install out various python scripts for use by make test
--bld.SAMBA_SCRIPT('samba_python_files',
-+ bld.SAMBA_SCRIPT('samba_python_files',
- pattern='samba/**/*.py',
- installdir='python')
-
--bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
-+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
---- a/source3/param/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source3/param/wscript_build 2016-01-08 19:50:12.760296220 -0500
-@@ -14,7 +14,8 @@
- group='build_source',
- rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3PROTO')
-
--bld.SAMBA3_PYTHON('pys3param',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pys3param',
- source='pyparam.c',
- deps='param',
- public_deps='samba-hostconfig pytalloc-util talloc',
---- a/source3/passdb/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source3/passdb/wscript_build 2016-01-08 19:50:12.770296179 -0500
-@@ -40,7 +40,8 @@
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED(),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED())
-
--bld.SAMBA3_PYTHON('pypassdb',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pypassdb',
- source='py_passdb.c',
- deps='pdb',
- public_deps='samba-util tdb_compat talloc pyrpc_util',
---- a/source3/wscript_build 2015-07-14 06:54:24.000000000 -0400
-+++ b/source3/wscript_build 2016-01-08 19:50:12.780296137 -0500
-@@ -1452,13 +1452,14 @@
- param''',
- install=False)
-
--bld.SAMBA3_PYTHON('pysmbd',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pysmbd',
- source='smbd/pysmbd.c',
- deps='smbd_base pyrpc_util',
- realname='samba/samba3/smbd.so'
- )
-
--bld.SAMBA3_PYTHON('pylibsmb',
-+ bld.SAMBA3_PYTHON('pylibsmb',
- source='libsmb/pylibsmb.c',
- deps='smbclient samba-credentials',
- realname='samba/samba3/libsmb_samba_internal.so'
---- a/source4/auth/gensec/wscript_build 2014-10-01 05:06:01.000000000 -0400
-+++ b/source4/auth/gensec/wscript_build 2016-01-08 19:50:12.560297043 -0500
-@@ -34,7 +34,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pygensec',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pygensec',
- source='pygensec.c',
- deps='gensec pytalloc-util pyparam_util',
- realname='samba/gensec.so'
---- a/source4/auth/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/auth/wscript_build 2016-01-08 19:50:12.580296961 -0500
-@@ -43,7 +43,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pyauth',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pyauth',
- source='pyauth.c',
- public_deps='auth_system_session',
- deps='samdb pytalloc-util pyparam_util pyldb-util pycredentials auth4',
---- a/source4/dsdb/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/dsdb/wscript_build 2016-01-08 19:50:12.590296920 -0500
-@@ -58,7 +58,9 @@
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
- )
-
--bld.SAMBA_PYTHON('python_dsdb',
-+
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_dsdb',
- source='pydsdb.c',
- # the dependency on dcerpc here is because gensec
- # depends on dcerpc but the waf circular dependency finder
---- a/source4/lib/com/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/lib/com/wscript_build 2016-01-08 19:50:12.600296878 -0500
-@@ -26,8 +26,8 @@
- init_function='com_simple_init'
- )
-
--
--bld.SAMBA_PYTHON('pycom',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pycom',
- source='pycom.c',
- deps='COM',
- realname='samba/com.so',
---- a/source4/lib/messaging/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/lib/messaging/wscript_build 2016-01-08 19:50:12.620296796 -0500
-@@ -8,7 +8,8 @@
- private_library=True
- )
-
--bld.SAMBA_PYTHON('python_messaging',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_messaging',
- source='pymessaging.c',
- deps='MESSAGING events pyparam_util',
- realname='samba/messaging.so'
---- a/source4/lib/policy/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/lib/policy/wscript_build 2016-01-08 20:29:35.981473795 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba-policy',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba-policy',
- source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c',
- pc_files='samba-policy.pc',
- public_deps='ldb samba-net',
-@@ -9,7 +10,7 @@
- public_headers='policy.h'
- )
-
--bld.SAMBA_PYTHON('py_policy',
-+ bld.SAMBA_PYTHON('py_policy',
- source='pypolicy.c',
- public_deps='samba-policy pytalloc-util',
- realname='samba/policy.so'
---- a/source4/lib/registry/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/lib/registry/wscript_build 2016-01-08 19:50:12.640296714 -0500
-@@ -62,7 +62,8 @@
- )
-
-
--bld.SAMBA_PYTHON('py_registry',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('py_registry',
- source='pyregistry.c',
- public_deps='registry pytalloc-util pyparam_util',
- realname='samba/registry.so'
---- a/source4/lib/wmi/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/lib/wmi/wscript_build 2016-01-08 19:50:12.650296673 -0500
-@@ -19,7 +19,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pywmi',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pywmi',
- source='wmi_wrap.c',
- public_deps='LIBCLI_SMB ndr samba-util samba-config WMI'
- )
---- a/source4/libcli/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/libcli/wscript_build 2016-01-08 19:50:12.660296631 -0500
-@@ -31,12 +31,13 @@
- public_headers='smb_composite/smb_composite.h',
- )
-
--bld.SAMBA_PYTHON('pysmb',
-- source='pysmb.c',
-- deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pysmb',
-+ source='pysmb.c',
-+ deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
- public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent param_options',
-- realname='samba/smb.so'
-- )
-+ realname='samba/smb.so'
-+ )
-
- bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
- source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c',
---- a/source4/libnet/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/libnet/wscript_build 2016-01-08 20:28:18.921747084 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba-net',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba-net',
- source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c',
- autoproto='libnet_proto.h',
- public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC LIBTSOCKET',
-@@ -8,13 +9,13 @@
- )
-
-
--bld.SAMBA_PYTHON('python_net',
-+ bld.SAMBA_PYTHON('python_net',
- source='py_net.c',
- deps='samba-net pyrpc_util',
- realname='samba/net.so'
- )
-
--bld.SAMBA_PYTHON('python_dckeytab',
-+ bld.SAMBA_PYTHON('python_dckeytab',
- source='py_net_dckeytab.c libnet_export_keytab.c',
- deps='pyrpc_util HDB_SAMBA4 com_err',
- realname='samba/dckeytab.so',
---- a/source4/librpc/wscript_build 2014-10-01 05:06:01.000000000 -0400
-+++ b/source4/librpc/wscript_build 2016-01-08 19:50:12.700296467 -0500
-@@ -143,228 +143,228 @@
- vnum='0.0.1'
- )
-
--bld.SAMBA_SUBSYSTEM('pyrpc_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('pyrpc_util',
- source='rpc/pyrpc_util.c',
- public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
- pyext=True,
- )
-
--
--bld.SAMBA_PYTHON('python_dcerpc',
-+ bld.SAMBA_PYTHON('python_dcerpc',
- source='rpc/pyrpc.c',
- public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util gensec',
- realname='samba/dcerpc/base.so'
- )
-
--bld.SAMBA_PYTHON('python_srvsvc',
-- source='../../librpc/gen_ndr/py_srvsvc.c',
-- deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-- realname='samba/dcerpc/srvsvc.so'
-- )
-+ bld.SAMBA_PYTHON('python_srvsvc',
-+ source='../../librpc/gen_ndr/py_srvsvc.c',
-+ deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-+ realname='samba/dcerpc/srvsvc.so'
-+ )
-
--bld.SAMBA_PYTHON('python_echo',
-+ bld.SAMBA_PYTHON('python_echo',
- source='../../librpc/gen_ndr/py_echo.c',
- deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
- realname='samba/dcerpc/echo.so'
- )
-
--bld.SAMBA_PYTHON('python_dns',
-+ bld.SAMBA_PYTHON('python_dns',
- source='../../librpc/gen_ndr/py_dns.c',
- deps='RPC_NDR_DNS pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dns.so'
- )
-
--bld.SAMBA_PYTHON('python_auth',
-+ bld.SAMBA_PYTHON('python_auth',
- source='../../librpc/gen_ndr/py_auth.c',
- deps='NDR_AUTH pytalloc-util pyrpc_util',
- realname='samba/dcerpc/auth.so'
- )
-
--bld.SAMBA_PYTHON('python_krb5pac',
-+ bld.SAMBA_PYTHON('python_krb5pac',
- source='../../librpc/gen_ndr/py_krb5pac.c',
- deps='ndr-krb5pac pytalloc-util pyrpc_util',
- realname='samba/dcerpc/krb5pac.so'
- )
-
--bld.SAMBA_PYTHON('python_winreg',
-+ bld.SAMBA_PYTHON('python_winreg',
- source='../../librpc/gen_ndr/py_winreg.c',
- deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
- realname='samba/dcerpc/winreg.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_misc',
-+ bld.SAMBA_PYTHON('python_dcerpc_misc',
- source='../../librpc/gen_ndr/py_misc.c',
- deps='pytalloc-util pyrpc_util ndr-krb5pac',
- realname='samba/dcerpc/misc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_initshutdown',
-+ bld.SAMBA_PYTHON('python_initshutdown',
- source='../../librpc/gen_ndr/py_initshutdown.c',
- deps='RPC_NDR_INITSHUTDOWN pytalloc-util pyrpc_util',
- realname='samba/dcerpc/initshutdown.so'
- )
-
-
--bld.SAMBA_PYTHON('python_epmapper',
-+ bld.SAMBA_PYTHON('python_epmapper',
- source='../../librpc/gen_ndr/py_epmapper.c',
- deps='dcerpc pytalloc-util pyrpc_util',
- realname='samba/dcerpc/epmapper.so'
- )
-
-
--bld.SAMBA_PYTHON('python_mgmt',
-+ bld.SAMBA_PYTHON('python_mgmt',
- source='../../librpc/gen_ndr/py_mgmt.c',
- deps='pytalloc-util dcerpc pyrpc_util',
- realname='samba/dcerpc/mgmt.so'
- )
-
-
--bld.SAMBA_PYTHON('python_atsvc',
-+ bld.SAMBA_PYTHON('python_atsvc',
- source='../../librpc/gen_ndr/py_atsvc.c',
- deps='dcerpc-atsvc pytalloc-util pyrpc_util',
- realname='samba/dcerpc/atsvc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_nbt',
-+ bld.SAMBA_PYTHON('python_dcerpc_nbt',
- source='../../librpc/gen_ndr/py_nbt.c',
- deps='ndr_nbt RPC_NDR_NBT pytalloc-util pyrpc_util',
- realname='samba/dcerpc/nbt.so'
- )
-
-
--bld.SAMBA_PYTHON('python_samr',
-+ bld.SAMBA_PYTHON('python_samr',
- source='../../librpc/gen_ndr/py_samr.c',
- deps='dcerpc-samr pytalloc-util pyrpc_util',
- realname='samba/dcerpc/samr.so'
- )
-
-
--bld.SAMBA_PYTHON('python_svcctl',
-+ bld.SAMBA_PYTHON('python_svcctl',
- source='../../librpc/gen_ndr/py_svcctl.c',
- deps='RPC_NDR_SVCCTL pytalloc-util pyrpc_util',
- realname='samba/dcerpc/svcctl.so'
- )
-
-
--bld.SAMBA_PYTHON('python_lsa',
-+ bld.SAMBA_PYTHON('python_lsa',
- source='../../librpc/gen_ndr/py_lsa.c',
- deps='RPC_NDR_LSA pytalloc-util pyrpc_util',
- realname='samba/dcerpc/lsa.so'
- )
-
-
--bld.SAMBA_PYTHON('python_wkssvc',
-+ bld.SAMBA_PYTHON('python_wkssvc',
- source='../../librpc/gen_ndr/py_wkssvc.c',
- deps='RPC_NDR_WKSSVC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/wkssvc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dfs',
-+ bld.SAMBA_PYTHON('python_dfs',
- source='../../librpc/gen_ndr/py_dfs.c',
- deps='RPC_NDR_DFS pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dfs.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_dcerpc',
-+ bld.SAMBA_PYTHON('python_dcerpc_dcerpc',
- source='../../librpc/gen_ndr/py_dcerpc.c',
- deps='NDR_DCERPC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dcerpc.so'
- )
-
--bld.SAMBA_PYTHON('python_unixinfo',
-+ bld.SAMBA_PYTHON('python_unixinfo',
- source='../../librpc/gen_ndr/py_unixinfo.c',
- deps='RPC_NDR_UNIXINFO pytalloc-util pyrpc_util',
- realname='samba/dcerpc/unixinfo.so'
- )
-
-
--bld.SAMBA_PYTHON('python_irpc',
-+ bld.SAMBA_PYTHON('python_irpc',
- source='gen_ndr/py_irpc.c',
- deps='RPC_NDR_IRPC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/irpc.so'
- )
-
--bld.SAMBA_PYTHON('python_server_id',
-+ bld.SAMBA_PYTHON('python_server_id',
- source='../../librpc/gen_ndr/py_server_id.c',
- deps='RPC_NDR_SERVER_ID pytalloc-util pyrpc_util',
- realname='samba/dcerpc/server_id.so'
- )
-
--bld.SAMBA_PYTHON('python_winbind',
-+ bld.SAMBA_PYTHON('python_winbind',
- source='../../librpc/gen_ndr/py_winbind.c',
- deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon',
- realname='samba/dcerpc/winbind.so'
- )
-
--bld.SAMBA_PYTHON('python_idmap',
-+ bld.SAMBA_PYTHON('python_idmap',
- source='../../librpc/gen_ndr/py_idmap.c',
- deps='NDR_IDMAP pytalloc-util pyrpc_util',
- realname='samba/dcerpc/idmap.so'
- )
-
-
--bld.SAMBA_PYTHON('python_drsuapi',
-+ bld.SAMBA_PYTHON('python_drsuapi',
- source='../../librpc/gen_ndr/py_drsuapi.c',
- deps='RPC_NDR_DRSUAPI pytalloc-util pyrpc_util',
- realname='samba/dcerpc/drsuapi.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_security',
-+ bld.SAMBA_PYTHON('python_dcerpc_security',
- source='../../librpc/gen_ndr/py_security.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY',
- realname='samba/dcerpc/security.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
-+ bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
- source='../../librpc/gen_ndr/py_drsblobs.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DRSBLOBS',
- realname='samba/dcerpc/drsblobs.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_dnsp',
-+ bld.SAMBA_PYTHON('python_dcerpc_dnsp',
- source='../../librpc/gen_ndr/py_dnsp.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DNSP',
- realname='samba/dcerpc/dnsp.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_xattr',
-+ bld.SAMBA_PYTHON('python_dcerpc_xattr',
- source='../../librpc/gen_ndr/py_xattr.c',
- deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
- realname='samba/dcerpc/xattr.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_idmap',
-+ bld.SAMBA_PYTHON('python_dcerpc_idmap',
- source='../../librpc/gen_ndr/py_idmap.c',
- deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
- realname='samba/dcerpc/idmap.so'
- )
-
--bld.SAMBA_PYTHON('python_netlogon',
-+ bld.SAMBA_PYTHON('python_netlogon',
- source='../../librpc/gen_ndr/py_netlogon.c',
- deps='RPC_NDR_NETLOGON pytalloc-util pyrpc_util',
- realname='samba/dcerpc/netlogon.so'
- )
-
--bld.SAMBA_PYTHON('python_dnsserver',
-+ bld.SAMBA_PYTHON('python_dnsserver',
- source='../../librpc/gen_ndr/py_dnsserver.c',
- deps='RPC_NDR_DNSSERVER pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dnsserver.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_smb_acl',
-+ bld.SAMBA_PYTHON('python_dcerpc_smb_acl',
- source='../../librpc/gen_ndr/py_smb_acl.c',
- deps='pytalloc-util pyrpc_util',
- realname='samba/dcerpc/smb_acl.so'
- )
-
--bld.SAMBA_SCRIPT('python_dcerpc_init',
-+ bld.SAMBA_SCRIPT('python_dcerpc_init',
- pattern='rpc/dcerpc.py',
- installdir='python/samba/dcerpc',
- installname='__init__.py')
-
--bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
-+ bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
---- a/source4/ntvfs/posix/wscript_build 2014-10-01 05:06:01.000000000 -0400
-+++ b/source4/ntvfs/posix/wscript_build 2016-01-08 19:50:12.730296343 -0500
-@@ -30,7 +30,8 @@
- )
-
-
--bld.SAMBA_MODULE('ntvfs_posix',
-+if not bld.env.disable_python:
-+ bld.SAMBA_MODULE('ntvfs_posix',
- source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
- autoproto='vfs_posix_proto.h',
- subsystem='ntvfs',
-@@ -40,7 +41,7 @@
- )
-
-
--bld.SAMBA_PYTHON('python_xattr_native',
-+ bld.SAMBA_PYTHON('python_xattr_native',
- source='python/pyxattr_native.c',
- deps='ndr ldb samdb samba-credentials pyparam_util attr',
- realname='samba/xattr_native.so'
-@@ -52,13 +53,14 @@
- autoproto='posix_eadb_proto.h',
- private_library=True)
-
--bld.SAMBA_PYTHON('python_posix_eadb',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_posix_eadb',
- source='python/pyposix_eadb.c',
- deps='pyparam_util posix_eadb tdb_compat',
- realname='samba/posix_eadb.so'
- )
-
--bld.SAMBA_PYTHON('python_xattr_tdb',
-+ bld.SAMBA_PYTHON('python_xattr_tdb',
- source='python/pyxattr_tdb.c',
- deps='pyparam_util xattr_tdb',
- realname='samba/xattr_tdb.so'
---- a/source4/param/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/source4/param/wscript_build 2016-01-08 19:50:12.750296261 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_SUBSYSTEM('PROVISION',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('PROVISION',
- source='provision.c pyparam.c',
- deps='LIBPYTHON pyparam_util ldb pytalloc-util pyldb-util',
- pyext=True,
-@@ -36,7 +37,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pyparam',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pyparam',
- source='pyparam.c',
- deps='samba-hostconfig pytalloc-util',
- realname='samba/param.so'
-@@ -47,7 +49,8 @@
- deps='samba-hostconfig')
-
-
--bld.SAMBA_SUBSYSTEM('pyparam_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('pyparam_util',
- source='pyparam_util.c',
- deps='LIBPYTHON samba-hostconfig',
- pyext=True,
---- a/source4/winbind/wscript_build 2014-10-01 04:12:22.000000000 -0400
-+++ b/source4/winbind/wscript_build 2016-01-08 20:31:17.741112909 -0500
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
-
--
--bld.SAMBA_MODULE('service_winbind',
-+if not bld.env.disable_python:
-+ bld.SAMBA_MODULE('service_winbind',
- source='wb_server.c wb_irpc.c wb_samba3_protocol.c wb_samba3_cmd.c wb_init_domain.c wb_dom_info.c wb_dom_info_trusted.c wb_sid2domain.c wb_name2domain.c wb_sids2xids.c wb_xids2sids.c wb_gid2sid.c wb_sid2uid.c wb_sid2gid.c wb_uid2sid.c wb_connect_lsa.c wb_connect_sam.c wb_cmd_lookupname.c wb_cmd_lookupsid.c wb_cmd_getdcname.c wb_cmd_getgrnam.c wb_cmd_getgrgid.c wb_cmd_getpwnam.c wb_cmd_getpwuid.c wb_cmd_userdomgroups.c wb_cmd_usersids.c wb_cmd_list_groups.c wb_cmd_list_trustdom.c wb_cmd_list_users.c wb_cmd_setpwent.c wb_cmd_getpwent.c wb_cmd_getgrent.c wb_cmd_setgrent.c wb_cmd_getgroups.c wb_pam_auth.c wb_sam_logon.c wb_update_rodc_dns.c',
- autoproto='wb_proto.h',
- subsystem='service',
---- a/wscript 2015-10-27 04:11:29.000000000 -0400
-+++ b/wscript 2016-01-08 19:50:12.510297249 -0500
-@@ -75,10 +75,15 @@
- opt.tool_options('python') # options for disabling pyc or pyo compilation
- # enable options related to building python extensions
-
-+ opt.add_option('--disable-python',
-+ help=("do not generate python modules"),
-+ action="store_true", dest='disable_python', default=False)
-
- def configure(conf):
- version = samba_version.load_version(env=conf.env)
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
- conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
- conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
-@@ -96,7 +101,10 @@
- conf.find_program('xsltproc', var='XSLTPROC')
-
- conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
-- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+ if conf.env.disable_python:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-+ else:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-
- if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
- # Mac OSX needs to have this and it's also needed that the python is compiled with this
---- a/wscript_build 2014-12-20 10:27:51.000000000 -0500
-+++ b/wscript_build 2016-01-08 19:50:12.510297249 -0500
-@@ -48,7 +48,8 @@
- bld.RECURSE('lib/param')
- bld.RECURSE('dynconfig')
- bld.RECURSE('lib/util/charset')
--bld.RECURSE('python')
-+if not bld.env.disable_python:
-+ bld.RECURSE('python')
- bld.RECURSE('source4/param')
- bld.RECURSE('source4/librpc')
- bld.RECURSE('source4/dsdb')
-@@ -99,7 +100,8 @@
- bld.RECURSE('source4/utils')
- bld.RECURSE('source4/ntvfs')
- bld.RECURSE('source4/ntptr')
--bld.RECURSE('source4/torture')
-+if not bld.env.disable_python:
-+ bld.RECURSE('source4/torture')
- bld.RECURSE('librpc')
- bld.RECURSE('source4')
- bld.RECURSE('source4/libcli')
---- a/lib/ldb-samba/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/lib/ldb-samba/wscript_build 2016-01-08 20:43:53.538486348 -0500
-@@ -19,7 +19,8 @@
- )
-
-
--bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
- deps='ldbsamba pyparam_util ldbwrap pyldb-util',
- realname='samba/_ldb.so')
-
---- a/libcli/echo/tests/wscript_build 2014-10-01 04:12:21.000000000 -0400
-+++ b/libcli/echo/tests/wscript_build 2016-01-08 21:06:36.644107638 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_MODULE('TORTURE_LIBCLI_ECHO',
-+if not bld.env.disable_python:
-+ bld.SAMBA_MODULE('TORTURE_LIBCLI_ECHO',
- source='echo.c',
- subsystem='smbtorture',
- init_function='torture_libcli_echo_init',
diff --git a/net-fs/samba/files/samba-4.3.3-disable-python-for-altabi.patch b/net-fs/samba/files/samba-4.3.3-disable-python-for-altabi.patch
deleted file mode 100644
index e35a7d0..0000000
--- a/net-fs/samba/files/samba-4.3.3-disable-python-for-altabi.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-diff -ur a/auth/credentials/wscript_build b/auth/credentials/wscript_build
---- a/auth/credentials/wscript_build 2015-07-21 05:47:48.000000000 -0400
-+++ b/auth/credentials/wscript_build 2016-01-11 15:00:28.939613937 -0500
-@@ -24,7 +24,8 @@
- source='credentials_ntlm.c',
- deps='samba-credentials')
-
--bld.SAMBA_PYTHON('pycredentials',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pycredentials',
- source='pycredentials.c',
- public_deps='samba-credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
- realname='samba/credentials.so'
-diff -ur a/lib/ldb/wscript b/lib/ldb/wscript
---- a/lib/ldb/wscript 2015-12-10 04:23:28.000000000 -0500
-+++ b/lib/ldb/wscript 2016-01-11 17:18:08.175466317 -0500
-@@ -34,6 +34,8 @@
- conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/tevent')
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- if conf.CHECK_FOR_THIRD_PARTY():
- conf.RECURSE('third_party/popt')
- else:
-@@ -47,7 +49,8 @@
- conf.find_program('xsltproc', var='XSLTPROC')
- conf.check_tool('python')
- conf.check_python_version((2,4,2))
-- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+ if not conf.env.disable_python:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-
- # where does the default LIBDIR end up? in conf.env somewhere?
- #
-@@ -56,12 +59,12 @@
- conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-
- if not conf.env.standalone_ldb:
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=SYSTEM_VERSION,
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=SYSTEM_VERSION,
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent ldb'):
- conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=SYSTEM_VERSION,
-- onlyif='talloc tdb tevent pyldb-util',
-+ if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=SYSTEM_VERSION,
-+ onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
-
-@@ -121,7 +124,7 @@
- bld.env.PACKAGE_VERSION = VERSION
- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-
-- if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
-+ if not bld.env.disable_python and not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
- bld.SAMBA_LIBRARY('pyldb-util',
- deps='ldb',
- source='pyldb_util.c',
-diff -ur a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
---- a/lib/ldb-samba/wscript_build 2015-09-08 09:45:25.000000000 -0400
-+++ b/lib/ldb-samba/wscript_build 2016-01-11 16:24:06.620294703 -0500
-@@ -19,7 +19,8 @@
- )
-
-
--bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
- deps='ldbsamba pyparam_util ldbwrap pyldb-util',
- realname='samba/_ldb.so')
-
-diff -ur a/lib/talloc/wscript b/lib/talloc/wscript
---- a/lib/talloc/wscript 2015-09-08 09:45:25.000000000 -0400
-+++ b/lib/talloc/wscript 2016-01-11 15:06:09.538876676 -0500
-@@ -48,7 +48,7 @@
- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TALLOC', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
- implied_deps='talloc replace'):
- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
-
-diff -ur a/lib/tdb/wscript b/lib/tdb/wscript
---- a/lib/tdb/wscript 2015-09-08 09:45:25.000000000 -0400
-+++ b/lib/tdb/wscript 2016-01-11 15:07:53.698683836 -0500
-@@ -82,7 +82,7 @@
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TDB', 1)
- conf.env.building_tdb = False
-- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
- conf.define('USING_SYSTEM_PYTDB', 1)
-
- conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-@@ -123,7 +123,7 @@
- else:
- private_library = True
-
-- if not bld.CONFIG_SET('USING_SYSTEM_TDB'):
-+ if not bld.env.disable_python and not bld.CONFIG_SET('USING_SYSTEM_TDB'):
-
- tdb_deps = 'replace'
-
-diff -ur a/lib/tevent/wscript b/lib/tevent/wscript
---- a/lib/tevent/wscript 2015-07-21 05:47:49.000000000 -0400
-+++ b/lib/tevent/wscript 2016-01-11 15:09:18.228533367 -0500
-@@ -34,11 +34,13 @@
-
- conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- if not conf.env.standalone_tevent:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
- onlyif='talloc', implied_deps='replace talloc'):
- conf.define('USING_SYSTEM_TEVENT', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
- conf.define('USING_SYSTEM_PYTEVENT', 1)
-
- if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
-@@ -61,8 +63,6 @@
- if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'):
- conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals)
-
-- conf.env.disable_python = getattr(Options.options, 'disable_python', False)
--
- if not conf.env.disable_python:
- # also disable if we don't have the python libs installed
- conf.find_program('python', var='PYTHON')
-diff -ur a/libcli/echo/tests/wscript_build b/libcli/echo/tests/wscript_build
---- a/libcli/echo/tests/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/libcli/echo/tests/wscript_build 2016-01-11 16:24:27.460246607 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_MODULE('TORTURE_LIBCLI_ECHO',
-+if not bld.env.disable_python:
-+ bld.SAMBA_MODULE('TORTURE_LIBCLI_ECHO',
- source='echo.c',
- subsystem='smbtorture',
- init_function='torture_libcli_echo_init',
-diff -ur a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
---- a/libcli/nbt/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/libcli/nbt/wscript_build 2016-01-11 15:09:55.648466757 -0500
-@@ -24,7 +24,8 @@
- install=False
- )
-
--bld.SAMBA_PYTHON('python_netbios',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_netbios',
- source='pynbt.c',
- public_deps='cli-nbt DYNCONFIG samba-hostconfig',
- realname='samba/netbios.so'
-diff -ur a/libcli/security/wscript_build b/libcli/security/wscript_build
---- a/libcli/security/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/libcli/security/wscript_build 2016-01-11 15:10:11.378438755 -0500
-@@ -7,7 +7,8 @@
- deps='talloc ndr NDR_SECURITY'
- )
-
--bld.SAMBA_PYTHON('pysecurity',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pysecurity',
- source='pysecurity.c',
- deps='samba-security pytalloc-util',
- realname='samba/security.so'
-diff -ur a/python/wscript_build b/python/wscript_build
---- a/python/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/python/wscript_build 2016-01-11 15:11:12.328330260 -0500
-@@ -1,13 +1,14 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba_python',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba_python',
- source=[],
- deps='LIBPYTHON pytalloc-util pyrpc_util',
- grouping_library=True,
- private_library=True,
- pyembed=True)
-
--bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-+ bld.SAMBA_SUBSYSTEM('LIBPYTHON',
- source='modules.c',
- public_deps='',
- init_function_sentinel='{NULL,NULL}',
-@@ -16,7 +17,7 @@
- )
-
-
--bld.SAMBA_PYTHON('python_uuid',
-+ bld.SAMBA_PYTHON('python_uuid',
- source='uuidmodule.c',
- deps='ndr',
- realname='uuid.so',
-@@ -24,7 +25,7 @@
- )
-
-
--bld.SAMBA_PYTHON('python_glue',
-+ bld.SAMBA_PYTHON('python_glue',
- source='pyglue.c',
- deps='pyparam_util samba-util netif pytalloc-util',
- realname='samba/_glue.so'
-@@ -32,8 +33,8 @@
-
-
- # install out various python scripts for use by make test
--bld.SAMBA_SCRIPT('samba_python_files',
-+ bld.SAMBA_SCRIPT('samba_python_files',
- pattern='samba/**/*.py',
- installdir='python')
-
--bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
-+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
-diff -ur a/source3/param/wscript_build b/source3/param/wscript_build
---- a/source3/param/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source3/param/wscript_build 2016-01-11 15:11:55.388253614 -0500
-@@ -14,7 +14,8 @@
- group='build_source',
- rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3PROTO')
-
--bld.SAMBA3_PYTHON('pys3param',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pys3param',
- source='pyparam.c',
- deps='param',
- public_deps='samba-hostconfig pytalloc-util talloc',
-diff -ur a/source3/passdb/wscript_build b/source3/passdb/wscript_build
---- a/source3/passdb/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source3/passdb/wscript_build 2016-01-11 15:12:25.978199164 -0500
-@@ -40,7 +40,8 @@
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED(),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED())
-
--bld.SAMBA3_PYTHON('pypassdb',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pypassdb',
- source='py_passdb.c',
- deps='pdb',
- public_deps='samba-util tdb talloc pyrpc_util',
-diff -ur a/source3/wscript_build b/source3/wscript_build
---- a/source3/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source3/wscript_build 2016-01-11 15:13:11.678117805 -0500
-@@ -1484,13 +1484,14 @@
- param''',
- install=False)
-
--bld.SAMBA3_PYTHON('pysmbd',
-+if not bld.env.disable_python:
-+ bld.SAMBA3_PYTHON('pysmbd',
- source='smbd/pysmbd.c',
- deps='smbd_base pyrpc_util',
- realname='samba/samba3/smbd.so'
- )
-
--bld.SAMBA3_PYTHON('pylibsmb',
-+ bld.SAMBA3_PYTHON('pylibsmb',
- source='libsmb/pylibsmb.c',
- deps='smbclient samba-credentials',
- realname='samba/samba3/libsmb_samba_internal.so'
-diff -ur a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
---- a/source4/auth/gensec/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/auth/gensec/wscript_build 2016-01-11 15:13:31.408082687 -0500
-@@ -22,7 +22,8 @@
- deps='gssapi samba-credentials authkrb5 com_err gensec_util'
- )
-
--bld.SAMBA_PYTHON('pygensec',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pygensec',
- source='pygensec.c',
- deps='gensec pytalloc-util pyparam_util',
- realname='samba/gensec.so'
-diff -ur a/source4/auth/wscript_build b/source4/auth/wscript_build
---- a/source4/auth/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/auth/wscript_build 2016-01-11 15:13:53.698043012 -0500
-@@ -43,7 +43,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pyauth',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pyauth',
- source='pyauth.c',
- public_deps='auth_system_session',
- deps='samdb pytalloc-util pyparam_util pyldb-util pycredentials auth4',
-diff -ur a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
---- a/source4/dsdb/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/dsdb/wscript_build 2016-01-11 17:18:54.355199618 -0500
-@@ -58,7 +58,8 @@
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
- )
-
--bld.SAMBA_PYTHON('python_dsdb',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_dsdb',
- source='pydsdb.c',
- # the dependency on dcerpc here is because gensec
- # depends on dcerpc but the waf circular dependency finder
-diff -ur a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build
---- a/source4/lib/com/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/lib/com/wscript_build 2016-01-11 15:14:15.448004296 -0500
-@@ -27,7 +27,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pycom',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pycom',
- source='pycom.c',
- deps='COM',
- realname='samba/com.so',
-diff -ur a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
---- a/source4/lib/messaging/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/lib/messaging/wscript_build 2016-01-11 15:15:19.467890326 -0500
-@@ -7,7 +7,8 @@
- private_library=True
- )
-
--bld.SAMBA_PYTHON('python_messaging',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_messaging',
- source='pymessaging.c',
- deps='MESSAGING events pyparam_util',
- realname='samba/messaging.so'
-diff -ur a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
---- a/source4/lib/policy/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/lib/policy/wscript_build 2016-01-11 15:16:01.397815695 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba-policy',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba-policy',
- source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c',
- pc_files='samba-policy.pc',
- public_deps='ldb samba-net',
-@@ -9,7 +10,7 @@
- public_headers='policy.h'
- )
-
--bld.SAMBA_PYTHON('py_policy',
-+ bld.SAMBA_PYTHON('py_policy',
- source='pypolicy.c',
- public_deps='samba-policy pytalloc-util',
- realname='samba/policy.so'
-diff -ur a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
---- a/source4/lib/registry/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/lib/registry/wscript_build 2016-01-11 16:12:54.391817258 -0500
-@@ -61,7 +61,8 @@
- )
-
-
--bld.SAMBA_PYTHON('py_registry',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('py_registry',
- source='pyregistry.c',
- public_deps='registry pytalloc-util pyparam_util',
- realname='samba/registry.so'
-diff -ur a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
---- a/source4/lib/wmi/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/lib/wmi/wscript_build 2016-01-11 16:13:14.691774082 -0500
-@@ -19,7 +19,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pywmi',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pywmi',
- source='wmi_wrap.c',
- public_deps='LIBCLI_SMB ndr samba-util samba-config WMI'
- )
-diff -ur a/source4/libcli/wscript_build b/source4/libcli/wscript_build
---- a/source4/libcli/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/libcli/wscript_build 2016-01-11 16:14:06.921662991 -0500
-@@ -31,12 +31,13 @@
- public_headers='smb_composite/smb_composite.h',
- )
-
--bld.SAMBA_PYTHON('pysmb',
-- source='pysmb.c',
-- deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pysmb',
-+ source='pysmb.c',
-+ deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util',
- public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent param_options',
-- realname='samba/smb.so'
-- )
-+ realname='samba/smb.so'
-+ )
-
- bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
- source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c',
-diff -ur a/source4/libnet/wscript_build b/source4/libnet/wscript_build
---- a/source4/libnet/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/libnet/wscript_build 2016-01-11 16:14:44.361583367 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_LIBRARY('samba-net',
-+if not bld.env.disable_python:
-+ bld.SAMBA_LIBRARY('samba-net',
- source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c',
- autoproto='libnet_proto.h',
- public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC LIBTSOCKET',
-@@ -8,13 +9,13 @@
- )
-
-
--bld.SAMBA_PYTHON('python_net',
-+ bld.SAMBA_PYTHON('python_net',
- source='py_net.c',
- deps='samba-net pyrpc_util',
- realname='samba/net.so'
- )
-
--bld.SAMBA_PYTHON('python_dckeytab',
-+ bld.SAMBA_PYTHON('python_dckeytab',
- source='py_net_dckeytab.c libnet_export_keytab.c',
- deps='pyrpc_util HDB_SAMBA4 com_err',
- realname='samba/dckeytab.so',
-diff -ur a/source4/librpc/wscript_build b/source4/librpc/wscript_build
---- a/source4/librpc/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/librpc/wscript_build 2016-01-11 16:17:21.861228841 -0500
-@@ -140,228 +140,229 @@
- vnum='0.0.1'
- )
-
--bld.SAMBA_SUBSYSTEM('pyrpc_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('pyrpc_util',
- source='rpc/pyrpc_util.c',
- public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
- pyext=True,
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc',
-+ bld.SAMBA_PYTHON('python_dcerpc',
- source='rpc/pyrpc.c',
- public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util gensec',
- realname='samba/dcerpc/base.so'
- )
-
--bld.SAMBA_PYTHON('python_srvsvc',
-- source='../../librpc/gen_ndr/py_srvsvc.c',
-- deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-- realname='samba/dcerpc/srvsvc.so'
-- )
-+ bld.SAMBA_PYTHON('python_srvsvc',
-+ source='../../librpc/gen_ndr/py_srvsvc.c',
-+ deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-+ realname='samba/dcerpc/srvsvc.so'
-+ )
-
--bld.SAMBA_PYTHON('python_echo',
-+ bld.SAMBA_PYTHON('python_echo',
- source='../../librpc/gen_ndr/py_echo.c',
- deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
- realname='samba/dcerpc/echo.so'
- )
-
--bld.SAMBA_PYTHON('python_dns',
-+ bld.SAMBA_PYTHON('python_dns',
- source='../../librpc/gen_ndr/py_dns.c',
- deps='RPC_NDR_DNS pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dns.so'
- )
-
--bld.SAMBA_PYTHON('python_auth',
-+ bld.SAMBA_PYTHON('python_auth',
- source='../../librpc/gen_ndr/py_auth.c',
- deps='NDR_AUTH pytalloc-util pyrpc_util',
- realname='samba/dcerpc/auth.so'
- )
-
--bld.SAMBA_PYTHON('python_krb5pac',
-+ bld.SAMBA_PYTHON('python_krb5pac',
- source='../../librpc/gen_ndr/py_krb5pac.c',
- deps='ndr-krb5pac pytalloc-util pyrpc_util',
- realname='samba/dcerpc/krb5pac.so'
- )
-
--bld.SAMBA_PYTHON('python_winreg',
-+ bld.SAMBA_PYTHON('python_winreg',
- source='../../librpc/gen_ndr/py_winreg.c',
- deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
- realname='samba/dcerpc/winreg.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_misc',
-+ bld.SAMBA_PYTHON('python_dcerpc_misc',
- source='../../librpc/gen_ndr/py_misc.c',
- deps='pytalloc-util pyrpc_util ndr-krb5pac',
- realname='samba/dcerpc/misc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_initshutdown',
-+ bld.SAMBA_PYTHON('python_initshutdown',
- source='../../librpc/gen_ndr/py_initshutdown.c',
- deps='RPC_NDR_INITSHUTDOWN pytalloc-util pyrpc_util',
- realname='samba/dcerpc/initshutdown.so'
- )
-
-
--bld.SAMBA_PYTHON('python_epmapper',
-+ bld.SAMBA_PYTHON('python_epmapper',
- source='../../librpc/gen_ndr/py_epmapper.c',
- deps='dcerpc pytalloc-util pyrpc_util',
- realname='samba/dcerpc/epmapper.so'
- )
-
-
--bld.SAMBA_PYTHON('python_mgmt',
-+ bld.SAMBA_PYTHON('python_mgmt',
- source='../../librpc/gen_ndr/py_mgmt.c',
- deps='pytalloc-util dcerpc pyrpc_util',
- realname='samba/dcerpc/mgmt.so'
- )
-
-
--bld.SAMBA_PYTHON('python_atsvc',
-+ bld.SAMBA_PYTHON('python_atsvc',
- source='../../librpc/gen_ndr/py_atsvc.c',
- deps='dcerpc-atsvc pytalloc-util pyrpc_util',
- realname='samba/dcerpc/atsvc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_nbt',
-+ bld.SAMBA_PYTHON('python_dcerpc_nbt',
- source='../../librpc/gen_ndr/py_nbt.c',
- deps='ndr_nbt RPC_NDR_NBT pytalloc-util pyrpc_util',
- realname='samba/dcerpc/nbt.so'
- )
-
-
--bld.SAMBA_PYTHON('python_samr',
-+ bld.SAMBA_PYTHON('python_samr',
- source='../../librpc/gen_ndr/py_samr.c',
- deps='dcerpc-samr pytalloc-util pyrpc_util',
- realname='samba/dcerpc/samr.so'
- )
-
-
--bld.SAMBA_PYTHON('python_svcctl',
-+ bld.SAMBA_PYTHON('python_svcctl',
- source='../../librpc/gen_ndr/py_svcctl.c',
- deps='RPC_NDR_SVCCTL pytalloc-util pyrpc_util',
- realname='samba/dcerpc/svcctl.so'
- )
-
-
--bld.SAMBA_PYTHON('python_lsa',
-+ bld.SAMBA_PYTHON('python_lsa',
- source='../../librpc/gen_ndr/py_lsa.c',
- deps='RPC_NDR_LSA pytalloc-util pyrpc_util',
- realname='samba/dcerpc/lsa.so'
- )
-
-
--bld.SAMBA_PYTHON('python_wkssvc',
-+ bld.SAMBA_PYTHON('python_wkssvc',
- source='../../librpc/gen_ndr/py_wkssvc.c',
- deps='RPC_NDR_WKSSVC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/wkssvc.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dfs',
-+ bld.SAMBA_PYTHON('python_dfs',
- source='../../librpc/gen_ndr/py_dfs.c',
- deps='RPC_NDR_DFS pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dfs.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_dcerpc',
-+ bld.SAMBA_PYTHON('python_dcerpc_dcerpc',
- source='../../librpc/gen_ndr/py_dcerpc.c',
- deps='NDR_DCERPC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dcerpc.so'
- )
-
--bld.SAMBA_PYTHON('python_unixinfo',
-+ bld.SAMBA_PYTHON('python_unixinfo',
- source='../../librpc/gen_ndr/py_unixinfo.c',
- deps='RPC_NDR_UNIXINFO pytalloc-util pyrpc_util',
- realname='samba/dcerpc/unixinfo.so'
- )
-
-
--bld.SAMBA_PYTHON('python_irpc',
-+ bld.SAMBA_PYTHON('python_irpc',
- source='gen_ndr/py_irpc.c',
- deps='RPC_NDR_IRPC pytalloc-util pyrpc_util',
- realname='samba/dcerpc/irpc.so'
- )
-
--bld.SAMBA_PYTHON('python_server_id',
-+ bld.SAMBA_PYTHON('python_server_id',
- source='../../librpc/gen_ndr/py_server_id.c',
- deps='RPC_NDR_SERVER_ID pytalloc-util pyrpc_util',
- realname='samba/dcerpc/server_id.so'
- )
-
--bld.SAMBA_PYTHON('python_winbind',
-+ bld.SAMBA_PYTHON('python_winbind',
- source='../../librpc/gen_ndr/py_winbind.c',
- deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon',
- realname='samba/dcerpc/winbind.so'
- )
-
--bld.SAMBA_PYTHON('python_idmap',
-+ bld.SAMBA_PYTHON('python_idmap',
- source='../../librpc/gen_ndr/py_idmap.c',
- deps='NDR_IDMAP pytalloc-util pyrpc_util',
- realname='samba/dcerpc/idmap.so'
- )
-
-
--bld.SAMBA_PYTHON('python_drsuapi',
-+ bld.SAMBA_PYTHON('python_drsuapi',
- source='../../librpc/gen_ndr/py_drsuapi.c',
- deps='RPC_NDR_DRSUAPI pytalloc-util pyrpc_util',
- realname='samba/dcerpc/drsuapi.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_security',
-+ bld.SAMBA_PYTHON('python_dcerpc_security',
- source='../../librpc/gen_ndr/py_security.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY',
- realname='samba/dcerpc/security.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
-+ bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
- source='../../librpc/gen_ndr/py_drsblobs.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DRSBLOBS',
- realname='samba/dcerpc/drsblobs.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_dnsp',
-+ bld.SAMBA_PYTHON('python_dcerpc_dnsp',
- source='../../librpc/gen_ndr/py_dnsp.c',
- deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DNSP',
- realname='samba/dcerpc/dnsp.so'
- )
-
-
--bld.SAMBA_PYTHON('python_dcerpc_xattr',
-+ bld.SAMBA_PYTHON('python_dcerpc_xattr',
- source='../../librpc/gen_ndr/py_xattr.c',
- deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
- realname='samba/dcerpc/xattr.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_idmap',
-+ bld.SAMBA_PYTHON('python_dcerpc_idmap',
- source='../../librpc/gen_ndr/py_idmap.c',
- deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
- realname='samba/dcerpc/idmap.so'
- )
-
--bld.SAMBA_PYTHON('python_netlogon',
-+ bld.SAMBA_PYTHON('python_netlogon',
- source='../../librpc/gen_ndr/py_netlogon.c',
- deps='RPC_NDR_NETLOGON pytalloc-util pyrpc_util',
- realname='samba/dcerpc/netlogon.so'
- )
-
--bld.SAMBA_PYTHON('python_dnsserver',
-+ bld.SAMBA_PYTHON('python_dnsserver',
- source='../../librpc/gen_ndr/py_dnsserver.c',
- deps='RPC_NDR_DNSSERVER pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dnsserver.so'
- )
-
--bld.SAMBA_PYTHON('python_dcerpc_smb_acl',
-+ bld.SAMBA_PYTHON('python_dcerpc_smb_acl',
- source='../../librpc/gen_ndr/py_smb_acl.c',
- deps='pytalloc-util pyrpc_util',
- realname='samba/dcerpc/smb_acl.so'
- )
-
--bld.SAMBA_SCRIPT('python_dcerpc_init',
-+ bld.SAMBA_SCRIPT('python_dcerpc_init',
- pattern='rpc/dcerpc.py',
- installdir='python/samba/dcerpc',
- installname='__init__.py')
-
--bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
-+ bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
-diff -ur a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build
---- a/source4/ntvfs/posix/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/ntvfs/posix/wscript_build 2016-01-11 16:18:40.921046390 -0500
-@@ -30,7 +30,8 @@
- )
-
-
--bld.SAMBA_MODULE('ntvfs_posix',
-+if not bld.env.disable_python:
-+ bld.SAMBA_MODULE('ntvfs_posix',
- source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
- autoproto='vfs_posix_proto.h',
- subsystem='ntvfs',
-@@ -40,7 +41,7 @@
- )
-
-
--bld.SAMBA_PYTHON('python_xattr_native',
-+ bld.SAMBA_PYTHON('python_xattr_native',
- source='python/pyxattr_native.c',
- deps='ndr ldb samdb samba-credentials pyparam_util attr',
- realname='samba/xattr_native.so'
-@@ -52,13 +53,14 @@
- autoproto='posix_eadb_proto.h',
- private_library=True)
-
--bld.SAMBA_PYTHON('python_posix_eadb',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('python_posix_eadb',
- source='python/pyposix_eadb.c',
- deps='pyparam_util posix_eadb tdb',
- realname='samba/posix_eadb.so'
- )
-
--bld.SAMBA_PYTHON('python_xattr_tdb',
-+ bld.SAMBA_PYTHON('python_xattr_tdb',
- source='python/pyxattr_tdb.c',
- deps='pyparam_util xattr_tdb',
- realname='samba/xattr_tdb.so'
-diff -ur a/source4/param/wscript_build b/source4/param/wscript_build
---- a/source4/param/wscript_build 2015-07-21 05:47:49.000000000 -0400
-+++ b/source4/param/wscript_build 2016-01-11 16:19:49.540888024 -0500
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
-
--bld.SAMBA_SUBSYSTEM('PROVISION',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('PROVISION',
- source='provision.c pyparam.c',
- deps='LIBPYTHON pyparam_util ldb pytalloc-util pyldb-util',
- pyext=True,
-@@ -36,7 +37,8 @@
- )
-
-
--bld.SAMBA_PYTHON('pyparam',
-+if not bld.env.disable_python:
-+ bld.SAMBA_PYTHON('pyparam',
- source='pyparam.c',
- deps='samba-hostconfig pytalloc-util',
- realname='samba/param.so'
-@@ -47,7 +49,8 @@
- deps='samba-hostconfig')
-
-
--bld.SAMBA_SUBSYSTEM('pyparam_util',
-+if not bld.env.disable_python:
-+ bld.SAMBA_SUBSYSTEM('pyparam_util',
- source='pyparam_util.c',
- deps='LIBPYTHON samba-hostconfig',
- pyext=True,
-diff -ur a/wscript b/wscript
---- a/wscript 2015-10-20 06:40:54.000000000 -0400
-+++ b/wscript 2016-01-11 16:22:35.870504146 -0500
-@@ -74,10 +74,15 @@
- opt.tool_options('python') # options for disabling pyc or pyo compilation
- # enable options related to building python extensions
-
-+ opt.add_option('--disable-python',
-+ help=("do not generate python modules"),
-+ action="store_true", dest='disable_python', default=False)
-
- def configure(conf):
- version = samba_version.load_version(env=conf.env)
-
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
- conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
- conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
-@@ -95,7 +100,10 @@
- conf.find_program('xsltproc', var='XSLTPROC')
-
- conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2, 6, 0))
-- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+ if conf.env.disable_python:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-+ else:
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-
- if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
- # Mac OSX needs to have this and it's also needed that the python is compiled with this
-diff -ur a/wscript_build b/wscript_build
---- a/wscript_build 2015-07-21 05:47:50.000000000 -0400
-+++ b/wscript_build 2016-01-11 16:23:36.900363296 -0500
-@@ -45,7 +45,8 @@
- bld.RECURSE('lib/param')
- bld.RECURSE('dynconfig')
- bld.RECURSE('lib/util/charset')
--bld.RECURSE('python')
-+if not bld.env.disable_python:
-+ bld.RECURSE('python')
- bld.RECURSE('source4/param')
- bld.RECURSE('source4/librpc')
- bld.RECURSE('source4/dsdb')
-@@ -100,7 +101,8 @@
- bld.RECURSE('source4/utils')
- bld.RECURSE('source4/ntvfs')
- bld.RECURSE('source4/ntptr')
--bld.RECURSE('source4/torture')
-+if not bld.env.disable_python:
-+ bld.RECURSE('source4/torture')
- bld.RECURSE('librpc')
- bld.RECURSE('source4')
- bld.RECURSE('source4/libcli')
diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild
index 1e65f98..973d1c1 100644
--- a/net-fs/samba/samba-4.2.7-r1.ebuild
+++ b/net-fs/samba/samba-4.2.7-r1.ebuild
@@ -14,7 +14,8 @@ MY_P="${PN}-${MY_PV}"
SRC_PATH="stable"
[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-${PV}.tar.xz"
KEYWORDS="~amd64 ~hppa ~x86"
[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
@@ -82,7 +83,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
"${FILESDIR}/${PN}-4.2.7-pam.patch"
- "${FILESDIR}/${PN}-4.2.7-disable-python-for-altabi.patch"
)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -107,6 +107,12 @@ pkg_setup() {
src_prepare() {
epatch ${PATCHES[@]}
+
+ # install the patches from tarball(s)
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
+
# Allow user patches
epatch_user
multilib_copy_sources
diff --git a/net-fs/samba/samba-4.3.3-r1.ebuild b/net-fs/samba/samba-4.3.3-r1.ebuild
index d7769ae..bb4da0b 100644
--- a/net-fs/samba/samba-4.3.3-r1.ebuild
+++ b/net-fs/samba/samba-4.3.3-r1.ebuild
@@ -14,7 +14,8 @@ MY_P="${PN}-${MY_PV}"
SRC_PATH="stable"
[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-${PV}.tar.xz"
KEYWORDS="~amd64 ~hppa ~x86"
[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
@@ -81,7 +82,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
"${FILESDIR}/${PN}-4.2.7-pam.patch"
- "${FILESDIR}/${PN}-4.3.3-disable-python-for-altabi.patch"
)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -106,6 +106,12 @@ pkg_setup() {
src_prepare() {
epatch ${PATCHES[@]}
+
+ # install the patches from tarball(s)
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
+
# Allow user patches
epatch_user
multilib_copy_sources
diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild
index e5cb37c..d6161bf 100644
--- a/net-fs/samba/samba-4.3.4.ebuild
+++ b/net-fs/samba/samba-4.3.4.ebuild
@@ -14,7 +14,8 @@ MY_P="${PN}-${MY_PV}"
SRC_PATH="stable"
[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.3.3.tar.xz"
KEYWORDS="~amd64 ~hppa ~x86"
[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
@@ -39,7 +40,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/popt[${MULTILIB_USEDEP}]
sys-libs/readline:=
virtual/libiconv
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP}]
>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
sys-libs/libcap
@@ -81,7 +82,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
"${FILESDIR}/${PN}-4.2.7-pam.patch"
- "${FILESDIR}/${PN}-4.3.3-disable-python-for-altabi.patch"
)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -106,6 +106,12 @@ pkg_setup() {
src_prepare() {
epatch ${PATCHES[@]}
+
+ # install the patches from tarball(s)
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/patches"
+
# Allow user patches
epatch_user
multilib_copy_sources
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2016-04-13 5:42 Sergey Popov
0 siblings, 0 replies; 17+ messages in thread
From: Sergey Popov @ 2016-04-13 5:42 UTC (permalink / raw
To: gentoo-commits
commit: 535397ee94308f764f1e1b0b073618f749895511
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 05:41:42 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 05:41:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535397ee
net-fs/samba: stop using /var/run in ebuild and conf files too
Gentoo-Bug: 454676
Package-Manager: portage-2.2.28
net-fs/samba/files/samba.conf | 4 ++--
net-fs/samba/samba-4.2.11.ebuild | 2 +-
net-fs/samba/samba-4.3.8.ebuild | 2 +-
net-fs/samba/samba-4.4.2.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
index b398b8d..e0a6f32 100644
--- a/net-fs/samba/files/samba.conf
+++ b/net-fs/samba/files/samba.conf
@@ -1,2 +1,2 @@
-D /var/run/samba 0755 root root
-D /var/lock/samba 0755 root root
+D /run/samba 0755 root root
+D /run/lock/samba 0755 root root
diff --git a/net-fs/samba/samba-4.2.11.ebuild b/net-fs/samba/samba-4.2.11.ebuild
index 51fcc33..eee6b52 100644
--- a/net-fs/samba/samba-4.2.11.ebuild
+++ b/net-fs/samba/samba-4.2.11.ebuild
@@ -137,7 +137,7 @@ multilib_src_configure() {
--sysconfdir=/etc
--localstatedir=/var
--with-modulesdir=/usr/$(get_libdir)/samba
- --with-piddir=/var/run/${PN}
+ --with-piddir=/run/${PN}
--bundled-libraries=NONE
--builtin-libraries=NONE
--disable-rpath
diff --git a/net-fs/samba/samba-4.3.8.ebuild b/net-fs/samba/samba-4.3.8.ebuild
index c7b267c..5b2cfe0 100644
--- a/net-fs/samba/samba-4.3.8.ebuild
+++ b/net-fs/samba/samba-4.3.8.ebuild
@@ -129,7 +129,7 @@ multilib_src_configure() {
--sysconfdir=/etc
--localstatedir=/var
--with-modulesdir=/usr/$(get_libdir)/samba
- --with-piddir=/var/run/${PN}
+ --with-piddir=/run/${PN}
--bundled-libraries=NONE
--builtin-libraries=NONE
--disable-rpath
diff --git a/net-fs/samba/samba-4.4.2.ebuild b/net-fs/samba/samba-4.4.2.ebuild
index 94cfac8..9f464a2 100644
--- a/net-fs/samba/samba-4.4.2.ebuild
+++ b/net-fs/samba/samba-4.4.2.ebuild
@@ -116,7 +116,7 @@ multilib_src_configure() {
--sysconfdir=/etc
--localstatedir=/var
--with-modulesdir=/usr/$(get_libdir)/samba
- --with-piddir=/var/run/${PN}
+ --with-piddir=/run/${PN}
--bundled-libraries=NONE
--builtin-libraries=NONE
--disable-rpath
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2017-01-19 2:44 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2017-01-19 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 4e557b9116160c188cd2ca685e69aea4844bf47a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 02:15:30 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 02:43:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e557b91
net-fs/samba: Bump to versions 4.5.4 and 4.6.0_rc1
Added possibility to build AD Domain Controller against bundled heimdal.
Thanks to Denis Kaganovich and David Williams for providing patches in
Gentoo bug #594130.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-fs/samba/Manifest | 4 +-
.../samba/files/samba-4.5.1-compile_et_fix.patch | 16 ++++++
net-fs/samba/metadata.xml | 3 ++
.../{samba-4.5.2.ebuild => samba-4.5.4.ebuild} | 59 +++++++++++++++-----
.../{samba-4.5.2.ebuild => samba-4.6.0_rc1.ebuild} | 62 ++++++++++++++++------
5 files changed, 114 insertions(+), 30 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 6dd456e..5856653 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,10 +3,12 @@ DIST samba-4.2.14.tar.gz 20883281 SHA256 db820a9947e44f04b0eb25e4aa0c3db32c4042f
DIST samba-4.3.12.tar.gz 20587617 SHA256 7e9c75b1e269224fd2fcd80415c813c7cf8021389e40777c7b63348d94a25180 SHA512 cba129bae5bb01e85b48e82336ddf8e348852e922829a3ed37a8aa02860057441f3b941cab6d9989cd09099ca4c45ee89cb343f30c10de51dff398ffbcaa43ce WHIRLPOOL 8f885da2ea0a15a04d7deb6aeb1919214b9a19306285e4e1c1ee1557e26b6dcc6f252f50e41fe5d3bc0ac537c446610c820909321c4e6aeb22e4708e6e05dcbc
DIST samba-4.4.7.tar.gz 20739248 SHA256 a69d6612e4a421640242ca66c4dbb0e4c20281e77dc24970a332770814d45c7c SHA512 a5c4fb9224c622c21efe479bccb5a14a9a55c92838dce2e45faf466cf9ca8cbf786dd4a4c0ed1b19d9fd0ee6a5b0c2a916d367ae96389d2280269971121b418c WHIRLPOOL 64d01c5041f12a4debec25fb5ec8a5f31a0aaa60274be34d96cccaf642dba3f0a709b12a5bbbc79633ad0e2548aa8f71c00fa52b67ac9e217ed849ec51af8f71
DIST samba-4.4.9.tar.gz 20750010 SHA256 10f76fa113213ae512db4a4823351178c93fb6bc95d98d0ebc72e3a74d43386f SHA512 9fda913ece883fbd4309623b03676629d944c6f14df359904db938ac956a2f56b347d51fd7293417b021d5b18145fb693649a54ec2125868ae3fb88f63a17e12 WHIRLPOOL ba92ee892e64e0192b9198423cea86548b4f8b1552634d8775fcff1b7d5c85b874155e4150568e5364b921678d69b668d907de955c2de4f03bc0c0a8075724ee
-DIST samba-4.5.2.tar.gz 20944229 SHA256 9297c4da1a2ee2cdb65161699b7007bc94afb39d46c25acd33f64e64c6b4397a SHA512 ac8309273de08703be9bfc182143175168dccc895c7e33dfe65d621d80788b10baa5a04f3b6d84476661c158769ee0a813dfe4890f6a511ed6e43441de18f722 WHIRLPOOL 6dee3ebceb0d6b06607b1c39ee7ab91368e721588e4f15b5d8f7f246a99a1c8ca422c4c82de42407b85d14dbdf7bd86bfa84d4fbd58f4b8dcfde66ea1d2bde4b
DIST samba-4.5.3.tar.gz 20946015 SHA256 f06dc454a1bb72b21a329e1ad75a14795886401671ec7439d69a6b824c492eca SHA512 3ba4002131a5d7db35a62bc5841ed7aa7c43d85f7f3509237aa97bd1ff8bac6358eb3acec178ddfa6e8fa9c390dadb947fa90eec27d1299e2a9ccdecc5e9bc16 WHIRLPOOL 6667ca8dac8f315f3d27ad8751f26538d0bc0749c16796640e09bdb8e085ceb095e780ff60c4bfcd29f77a65c56933bb42ec9358d706a62ca9d3612b70d68a8f
+DIST samba-4.5.4.tar.gz 20958348 SHA256 1800d10ea14cabef67c83cc56a0f37f4f30ba5df218b3a1e7c874069a08c0f40 SHA512 7b24227e17ab091e6165c605f28af19fa846de63f3f24508411db2b509d942e599702dd278c8430481d7a404c5a97005148286ea4e94a35b57a1ec303b1a4409 WHIRLPOOL a1b84726b0a0addb1ca2de8d84429280a82001bf2fb0fbd7524dd2499fb18370d19e099b0852b93cb105b3db45583688b107533d404703ac635c2e6e8e2cb81b
+DIST samba-4.6.0rc1.tar.gz 20981499 SHA256 9b940a1d099e4953552fec204fb67e4d20e329fb26a7233b608b054ebf3d1db9 SHA512 6204d133c0cbe108f6bdd818ccce0ea462b9f6e5dc3da7033b9d544108617c8826f8223cd9712b46b1230ed9a6b87ab45f326b8644db30dcbfd7158ec2f14130 WHIRLPOOL 82071173ff61a12ada51b8e4710a3990e8310a811ebf751d2bdbe6d3e0cc9705f9c0cde6121225829a80fcac97952e41d5aee497e6b269c1e3feae4c1f5ad88e
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
DIST samba-disable-python-patches-4.3.12.tar.xz 6172 SHA256 d46c03d906d3ab1009bcfd511b85107b276b7950854f2a36c714a6a73244f632 SHA512 5396419fb4e104564b889806596d76c8e84620c9236da7421e12e2eaeaa48811e4528f51fae49b832cb917010c2e10defd5fd70e8d65b6706f7833bdac4c8892 WHIRLPOOL f4aa70cf50e592e603f8e0a0e36e40d7eee1f2c336d701c84243d79ae5d43a7d247785730a91f16b5ec38c6dc387561cfd64ec476a96096e8ba3e6ca97c5ffbe
DIST samba-disable-python-patches-4.4.6.tar.xz 6284 SHA256 64414f0fc431257693087be2a745f50c35d3256d5e9fad4e9fdb74606617cc4f SHA512 91e7c14096a9c1a5ccdd44fe8930604537b32d472c1e18866c20643e72729ab75f3ad1f0fb4233c168cfb987c0db69e636944df8e539b6564c74121497e00b79 WHIRLPOOL f16cff9a254e7caa2d76c89f3063853dfc25249414b70a9bb62183bdce4e4bbe582e8a9dbce2f70e9e1bff1f4f0c59f77f74012574611f61a90edda668597a98
DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
+DIST samba-disable-python-patches-4.6.0_rc1.tar.xz 6208 SHA256 9d013d65759c66db89d99c6017c618f2eff9928c2d761e5865dd125c6ca2ba1b SHA512 f11faaab3ca92d7ca5e3b43fc0d9d8360c0773cfd085ab273622be8ea8769ec4783e8a81ecee005bdb73dc07e45073248b24a3c52da5455f3ff0c9416295188f WHIRLPOOL 7712e5d7af563da12c4cf8a06bb64eca021e5b7a390a7b64f209e304c365847013fc9be6381397b203bc9c4040b3d838afd0be8b72bc1bed4099f6ed21f70860
diff --git a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
new file mode 100644
index 00000000..463512f
--- /dev/null
+++ b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
@@ -0,0 +1,16 @@
+--- samba-4.5.1/source4/heimdal_build/wscript_configure
++++ samba-4.5.1/source4/heimdal_build/wscript_configure
+@@ -258,7 +258,11 @@
+
+ # With the proper checks in place we should be able to build against the system libtommath.
+ #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
+ # conf.define('USING_SYSTEM_TOMMATH', 1)
+
+-check_system_heimdal_binary("compile_et")
+-check_system_heimdal_binary("asn1_compile")
++# comment out next line to stop Gentoo Samba build from using the compile_et in e2fsprogs-libs
++# to compile the error tables. This produces a compile error later on.
++#check_system_heimdal_binary("compile_et")
++#
++# As a precaution do the same for asn1_compile
++#check_system_heimdal_binary("asn1_compile")
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 7ac72a5..c6b9bbe 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -16,8 +16,11 @@
<flag name="client">Enables the client part</flag>
<flag name="cluster">Enable support for clustering</flag>
<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
+ <flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
<flag name="iprint">Enabling iPrint technology by Novell</flag>
<flag name="quota">Enables support for user quotas</flag>
+ <flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
+ bundled heimdal.</flag>
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
<pkg>app-crypt/heimdal</pkg>.</flag>
<flag name="winbind">Enables support for the winbind auth daemon</flag>
diff --git a/net-fs/samba/samba-4.5.2.ebuild b/net-fs/samba/samba-4.5.4.ebuild
similarity index 78%
copy from net-fs/samba/samba-4.5.2.ebuild
copy to net-fs/samba/samba-4.5.4.ebuild
index a4d2b1a..e0a0e03 100644
--- a/net-fs/samba/samba-4.5.2.ebuild
+++ b/net-fs/samba/samba-4.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,8 +25,8 @@ LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/samba-4.0/policy.h
@@ -47,17 +47,17 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/libbsd[${MULTILIB_USEDEP}]
dev-libs/iniparser:0
dev-libs/popt[${MULTILIB_USEDEP}]
- sys-libs/readline:=
- virtual/libiconv
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
- sys-libs/libcap
>=sys-libs/ldb-1.1.27[ldap(+)?,${MULTILIB_USEDEP}]
+ sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
pam? ( virtual/pam )
acl? ( virtual/acl )
addns? ( net-dns/bind-tools[gssapi] )
@@ -65,11 +65,14 @@ CDEPEND="${PYTHON_DEPS}
cups? ( net-print/cups )
dmapi? ( sys-apps/dmapi )
fam? ( virtual/fam )
- gnutls? ( dev-libs/libgcrypt:0
- >=net-libs/gnutls-1.4.0 )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
- !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )"
DEPEND="${CDEPEND}
virtual/pkgconfig"
@@ -81,12 +84,15 @@ RDEPEND="${CDEPEND}
REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
ads? ( acl gnutls ldap )
+ gpg? ( addc )
+ ?? ( system-heimdal system-mitkrb5 )
${PYTHON_REQUIRED_USE}"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -99,7 +105,9 @@ SHAREDMODS=""
pkg_setup() {
python-single-r1_pkg_setup
if use cluster ; then
- SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
fi
}
@@ -107,15 +115,28 @@ src_prepare() {
default
# install the patches from tarball(s)
- eapply "${WORKDIR}/patches/"
+ eapply "${WORKDIR}/patches"
# ugly hackaround for bug #592502
cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
multilib_copy_sources
}
multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if use addc && ! use system-heimdal ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ #bundled_libs="heimdal,NONE"
+ fi
+
local myconf=()
myconf=(
--enable-fhs
@@ -123,7 +144,7 @@ multilib_src_configure() {
--localstatedir="${EPREFIX}/var"
--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
--with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries=NONE
+ --bundled-libraries="${bundled_libs}"
--builtin-libraries=NONE
--disable-rpath
--disable-rpath-install
@@ -136,12 +157,12 @@ multilib_src_configure() {
$(usex addc '' '--without-ad-dc')
$(use_with addns dnsupdate)
$(use_with ads)
- $(usex ads '--with-shared-modules=idmap_ad' '')
$(use_with cluster cluster-support)
$(use_enable cups)
$(use_with dmapi)
$(use_with fam)
$(use_enable gnutls)
+ $(use_with gpg gpgme)
$(use_enable iprint)
$(use_with ldap)
$(use_with pam)
@@ -167,6 +188,7 @@ multilib_src_configure() {
--without-dmapi
--without-fam
--disable-gnutls
+ --without-gpgme
--disable-iprint
$(use_with ldap)
--without-pam
@@ -205,6 +227,15 @@ multilib_src_install() {
insinto /etc/samba
doins examples/smb.conf.default
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
# Install init script and conf.d file
newinitd "${CONFDIR}/samba4.initd-r1" samba
newconfd "${CONFDIR}/samba4.confd" samba
@@ -232,6 +263,6 @@ pkg_postinst() {
elog "For further information and migration steps make sure to read "
elog "http://samba.org/samba/history/${P}.html "
- elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-fs/samba/samba-4.5.2.ebuild b/net-fs/samba/samba-4.6.0_rc1.ebuild
similarity index 77%
rename from net-fs/samba/samba-4.5.2.ebuild
rename to net-fs/samba/samba-4.6.0_rc1.ebuild
index a4d2b1a..093f6f7 100644
--- a/net-fs/samba/samba-4.5.2.ebuild
+++ b/net-fs/samba/samba-4.6.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_PATH="stable"
[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
- https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz"
+ https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.6.0_rc1.tar.xz"
[[ ${PV} = *_rc* ]] || \
KEYWORDS="~amd64 ~hppa ~x86"
@@ -25,8 +25,8 @@ LICENSE="GPL-3"
SLOT="0"
-IUSE="acl addc addns ads client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/samba-4.0/policy.h
@@ -47,17 +47,18 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/libbsd[${MULTILIB_USEDEP}]
dev-libs/iniparser:0
dev-libs/popt[${MULTILIB_USEDEP}]
- sys-libs/readline:=
- virtual/libiconv
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
- sys-libs/libcap
>=sys-libs/ldb-1.1.27[ldap(+)?,${MULTILIB_USEDEP}]
+ sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
pam? ( virtual/pam )
acl? ( virtual/acl )
addns? ( net-dns/bind-tools[gssapi] )
@@ -65,11 +66,14 @@ CDEPEND="${PYTHON_DEPS}
cups? ( net-print/cups )
dmapi? ( sys-apps/dmapi )
fam? ( virtual/fam )
- gnutls? ( dev-libs/libgcrypt:0
- >=net-libs/gnutls-1.4.0 )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
- !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )"
DEPEND="${CDEPEND}
virtual/pkgconfig"
@@ -81,12 +85,15 @@ RDEPEND="${CDEPEND}
REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
ads? ( acl gnutls ldap )
+ gpg? ( addc )
+ ?? ( system-heimdal system-mitkrb5 )
${PYTHON_REQUIRED_USE}"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -99,7 +106,9 @@ SHAREDMODS=""
pkg_setup() {
python-single-r1_pkg_setup
if use cluster ; then
- SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
fi
}
@@ -107,15 +116,28 @@ src_prepare() {
default
# install the patches from tarball(s)
- eapply "${WORKDIR}/patches/"
+ eapply "${WORKDIR}/patches"
# ugly hackaround for bug #592502
cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
multilib_copy_sources
}
multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if use addc && ! use system-heimdal ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ #bundled_libs="heimdal,NONE"
+ fi
+
local myconf=()
myconf=(
--enable-fhs
@@ -123,7 +145,7 @@ multilib_src_configure() {
--localstatedir="${EPREFIX}/var"
--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
--with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries=NONE
+ --bundled-libraries="${bundled_libs}"
--builtin-libraries=NONE
--disable-rpath
--disable-rpath-install
@@ -136,12 +158,12 @@ multilib_src_configure() {
$(usex addc '' '--without-ad-dc')
$(use_with addns dnsupdate)
$(use_with ads)
- $(usex ads '--with-shared-modules=idmap_ad' '')
$(use_with cluster cluster-support)
$(use_enable cups)
$(use_with dmapi)
$(use_with fam)
$(use_enable gnutls)
+ $(use_with gpg gpgme)
$(use_enable iprint)
$(use_with ldap)
$(use_with pam)
@@ -167,6 +189,7 @@ multilib_src_configure() {
--without-dmapi
--without-fam
--disable-gnutls
+ --without-gpgme
--disable-iprint
$(use_with ldap)
--without-pam
@@ -205,6 +228,15 @@ multilib_src_install() {
insinto /etc/samba
doins examples/smb.conf.default
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
# Install init script and conf.d file
newinitd "${CONFDIR}/samba4.initd-r1" samba
newconfd "${CONFDIR}/samba4.confd" samba
@@ -232,6 +264,6 @@ pkg_postinst() {
elog "For further information and migration steps make sure to read "
elog "http://samba.org/samba/history/${P}.html "
- elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2017-08-11 21:23 Ian Stakenvicius
0 siblings, 0 replies; 17+ messages in thread
From: Ian Stakenvicius @ 2017-08-11 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 0a2e00c977a208bb929489f763798bcdd321b3b3
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 21:20:26 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 21:23:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2e00c9
net-fs/samba: add 4.7.0_rc3
Adding a first draft of samba-4.7
There may be patches available upstream or already included that will allow
Active Directory flag to be enabled while retaining system-mitkrb5; future
revisions will make the necessary adjustments if it can be made to work.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-fs/samba/Manifest | 1 +
net-fs/samba/files/talloc-disable-python.patch | 34 +++
net-fs/samba/samba-4.7.0_rc3.ebuild | 296 +++++++++++++++++++++++++
3 files changed, 331 insertions(+)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 5ab51c9735d..54da080958e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,5 +6,6 @@ DIST samba-4.6.0-disable-python-patches.tar.xz 7544 SHA256 508adeea65604ef8f4da0
DIST samba-4.6.6.tar.gz 21120791 SHA256 fc31c809f7d85ae30f2b7dcddcb8404201b626047458cb5f2b743d4f6f3f1a8e SHA512 e06bdc83f44c449212f2e45a902e2ca547505a75e970166259b91d2093fb442cdfd456e724d0e842b674b4b8d5bdbe9072996d768c08ebd979a44b2494a59799 WHIRLPOOL eee4bc7e6d5a102b4ab7146354afd7501bc4ad6a3af1aa63ffecf7eb54dc04f113248048157ca9e8c9cd3c21a0931b0fae1d8dc7232e29a92ebbf5d6cccd4c55
DIST samba-4.6.7-disable-python-patches.tar.xz 8896 SHA256 33702adba80e9886625fda8cba46d4017ae603f5d9cf9d3dc78e5ef30ff6f5eb SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb WHIRLPOOL 1cb176480b8583369e1085c8e122958112c0d13aa8ba78cd57dfd04b17c7d8f0a0664a43d277deba86775f1944eab052f4fb9459f64506215ae25184c86cbe40
DIST samba-4.6.7.tar.gz 21137329 SHA256 9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa SHA512 394c28204bae4134e6a9d2e5b8f087a425dc4ac4ceecd8b29315acff1a92349d40ef0b6a9cc34f5ad18ff5ec9979199837c87f687858cb4e6687968284303aa5 WHIRLPOOL 14282c4a88a22f932099ef47dc50f57c5fef87d6909d529d3eb837b6e958f490a5fd64ce1a5dfdd36eab5ac82b41583736953be2be279f70f0491c61fd1d0d92
+DIST samba-4.7.0rc3.tar.gz 16789893 SHA256 b162e861889d92024a9083a5ef63d22a06f5065c3d48ee8f5e103f886428b89e SHA512 f943f41e45bda040e8b7e4c4ed170fcad10694d46a530ff4d3e049f3b7d9566ffd92dfb7654df9a9ad2ba65e813dc2a186624a241f6b1d774108c7541009bded WHIRLPOOL 9bea73b5f6db8f3d453b24c0dfebb5396b28efc811f3dfe54ca8914764624be61f7f6fdcb9f8b0d3c8463fc7a39cb6e6eadefa08e900db8f025c63ae38705fde
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
diff --git a/net-fs/samba/files/talloc-disable-python.patch b/net-fs/samba/files/talloc-disable-python.patch
new file mode 100644
index 00000000000..6ef45eb37fb
--- /dev/null
+++ b/net-fs/samba/files/talloc-disable-python.patch
@@ -0,0 +1,34 @@
+--- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400
++++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400
+@@ -74,19 +74,22 @@
+ implied_deps='replace'):
+ conf.define('USING_SYSTEM_TALLOC', 1)
+
+- using_system_pytalloc_util = True
+- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
+- implied_deps='talloc replace'):
++ if conf.env.disable_python:
+ using_system_pytalloc_util = False
+-
+- # We need to get a pytalloc-util for all the python versions
+- # we are building for
+- if conf.env['EXTRA_PYTHON']:
+- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
+- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
++ else:
++ using_system_pytalloc_util = True
++ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
+ implied_deps='talloc replace'):
+ using_system_pytalloc_util = False
+
++ # We need to get a pytalloc-util for all the python versions
++ # we are building for
++ if conf.env['EXTRA_PYTHON']:
++ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
++ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
++ implied_deps='talloc replace'):
++ using_system_pytalloc_util = False
++
+ if using_system_pytalloc_util:
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
+
diff --git a/net-fs/samba/samba-4.7.0_rc3.ebuild b/net-fs/samba/samba-4.7.0_rc3.ebuild
new file mode 100644
index 00000000000..6a8a94e557e
--- /dev/null
+++ b/net-fs/samba/samba-4.7.0_rc3.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/samba-4.0/policy.h
+ /usr/include/samba-4.0/dcerpc_server.h
+ /usr/include/samba-4.0/ctdb.h
+ /usr/include/samba-4.0/ctdb_client.h
+ /usr/include/samba-4.0/ctdb_protocol.h
+ /usr/include/samba-4.0/ctdb_private.h
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h
+ /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libaio[${MULTILIB_USEDEP}]
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/iniparser:0
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
+ sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.2.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.33[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ pam? ( virtual/pam )
+ acl? ( virtual/acl )
+ addns? (
+ net-dns/bind-tools[gssapi]
+ dev-python/dnspython:=[${PYTHON_USEDEP}]
+ )
+ cluster? ( !dev-db/ctdb )
+ cups? ( net-print/cups )
+ dmapi? ( sys-apps/dmapi )
+ fam? ( virtual/fam )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+ system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? (
+ !system-mitkrb5? (
+ >=sys-libs/nss_wrapper-1.1.3
+ >=net-dns/resolv_wrapper-1.1.4
+ >=net-libs/socket_wrapper-1.1.7
+ >=sys-libs/uid_wrapper-1.2.1
+ )
+ )"
+RDEPEND="${CDEPEND}
+ python? ( ${PYTHON_DEPS} )
+ client? ( net-fs/cifs-utils[ads?] )
+ selinux? ( sec-policy/selinux-samba )
+ !dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
+ test? ( python )
+ addns? ( python )
+ ads? ( acl gnutls ldap )
+ gpg? ( addc )
+ ?? ( system-heimdal system-mitkrb5 )
+ ${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}"/talloc-disable-python.patch
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use cluster ; then
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # un-bundle dnspython
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+ # unbundle iso8601 unless tests are enabled
+ use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+ # ugly hackaround for bug #592502
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ fi
+
+ local myconf=()
+ myconf=(
+ --enable-fhs
+ --sysconfdir="${EPREFIX}/etc"
+ --localstatedir="${EPREFIX}/var"
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+ --with-piddir="${EPREFIX}/run/${PN}"
+ --bundled-libraries="${bundled_libs}"
+ --builtin-libraries=NONE
+ --disable-rpath
+ --disable-rpath-install
+ --nopyc
+ --nopyo
+ )
+ if multilib_is_native_abi ; then
+ myconf+=(
+ $(use_with acl acl-support)
+ $(usex addc '' '--without-ad-dc')
+ $(use_with addns dnsupdate)
+ $(use_with ads)
+ $(use_with cluster cluster-support)
+ $(use_enable cups)
+ $(use_with dmapi)
+ $(use_with fam)
+ $(use_enable gnutls)
+ $(use_with gpg gpgme)
+ $(use_enable iprint)
+ $(use_with ldap)
+ $(use_with pam)
+ $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+ $(use_with quota quotas)
+ $(use_with syslog)
+ $(use_with systemd)
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '')
+ $(use_with winbind)
+ $(usex python '' '--disable-python')
+ $(usex test '--enable-selftest' '')
+ $(use_enable zeroconf avahi)
+ --with-shared-modules=${SHAREDMODS}
+ )
+ else
+ myconf+=(
+ --without-acl-support
+ --without-ad-dc
+ --without-dnsupdate
+ --without-ads
+ --disable-avahi
+ --without-cluster-support
+ --disable-cups
+ --without-dmapi
+ --without-fam
+ --disable-gnutls
+ --without-gpgme
+ --disable-iprint
+ $(use_with ldap)
+ --without-pam
+ --without-quotas
+ --without-syslog
+ --without-systemd
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '')
+ --without-winbind
+ --disable-python
+ )
+ fi
+
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # Make all .so files executable
+ find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+ if multilib_is_native_abi; then
+ # install ldap schema for server (bug #491002)
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins examples/LDAP/samba.schema
+ fi
+
+ # create symlink for cups (bug #552310)
+ if use cups ; then
+ dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+ fi
+
+ # install example config file
+ insinto /etc/samba
+ doins examples/smb.conf.default
+
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
+ # Install init script and conf.d file
+ newinitd "${CONFDIR}/samba4.initd-r1" samba
+ newconfd "${CONFDIR}/samba4.confd" samba
+
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+ systemd_dounit "${FILESDIR}"/nmbd.service
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+ systemd_dounit "${FILESDIR}"/winbindd.service
+ systemd_dounit "${FILESDIR}"/samba.service
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ "${WAF_BINARY}" test || die "test failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Be aware the this release contains the best of all of Samba's"
+ ewarn "technology parts, both a file server (that you can reasonably expect"
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+ ewarn "controller work previously known as 'samba4'."
+
+ elog "For further information and migration steps make sure to read "
+ elog "http://samba.org/samba/history/${P}.html "
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+ elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2017-11-13 15:49 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2017-11-13 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 51c693cb95d3dcde67b32a3a39944e0759d1c2a3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 15:49:04 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 15:49:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c693cb
net-fs/samba: Fixed build with rpc-less glibc.
Closes: https://bugs.gentoo.org/606542
Closes: https://bugs.gentoo.org/637320
Package-Manager: Portage-2.3.13, Repoman-2.3.4
net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 ++++++++++++++
net-fs/samba/samba-4.6.9.ebuild | 1 +
net-fs/samba/samba-4.7.1.ebuild | 1 +
3 files changed, 16 insertions(+)
diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
new file mode 100644
index 00000000000..e66446845f2
--- /dev/null
+++ b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
@@ -0,0 +1,14 @@
+https://attachments.samba.org/attachment.cgi?id=13172
+https://bugs.gentoo.org/637320
+
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -71,7 +71,7 @@
+ conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+ conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+
+- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
++ conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+ conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
index 43d075a4a99..3f12fb2f123 100644
--- a/net-fs/samba/samba-4.6.9.ebuild
+++ b/net-fs/samba/samba-4.6.9.ebuild
@@ -119,6 +119,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.7.1.ebuild b/net-fs/samba/samba-4.7.1.ebuild
index 8e9afc791ab..e04ebce2c5b 100644
--- a/net-fs/samba/samba-4.7.1.ebuild
+++ b/net-fs/samba/samba-4.7.1.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
"${FILESDIR}"/talloc-disable-python.patch
+ "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2017-12-25 20:52 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2017-12-25 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 6174ece5d7584bdb90200ed4bef8a8a2b2f63b9d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 20:48:35 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 20:51:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6174ece5
net-fs/samba: Bump to version 4.7.4
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-fs/samba/Manifest | 1 +
net-fs/samba/files/samba-4.7.4-no_ads.patch | 22 ++
net-fs/samba/samba-4.7.4.ebuild | 306 ++++++++++++++++++++++++++++
3 files changed, 329 insertions(+)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 519e479e25e..90430cd026f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,5 +6,6 @@ DIST samba-4.6.11.tar.gz 21157318 BLAKE2B 7784b898fdf5bf96f3d0b0d3786be20aab55b0
DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b26bf8c039619359b789e675f963aec044e11443a8f6a865ea8564d58fe12d5268f00d71c9544e1abd27e9647f7 SHA512 e45a6ee43bcb2fba224bf38771d30daace46ad92b05f580a261aaacf7de9eca3d71cb4f4b2f956d83d84df489cb6f015b3b7abb42702ed2936bf92faa945340c
DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
DIST samba-4.7.3.tar.gz 16845436 BLAKE2B d38f58a944d19f4475ab636f09a4f9b97b92897b1d8d041efc07e1d2724d07fafa3686b5d38b847b896c4f024f5cf7330eaca4b6eb4cd34da73a32fe94e8c69e SHA512 3fd9d5f208201e3137c5966e10878ba2fc00fa80b3468e8b402e08f941b5508edd7181720033aaa25fcff0ee0ae5438619423d41a9b9b3d14dc3743fbe3f902f
+DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
diff --git a/net-fs/samba/files/samba-4.7.4-no_ads.patch b/net-fs/samba/files/samba-4.7.4-no_ads.patch
new file mode 100644
index 00000000000..d4c26a39a73
--- /dev/null
+++ b/net-fs/samba/files/samba-4.7.4-no_ads.patch
@@ -0,0 +1,22 @@
+https://lists.samba.org/archive/samba-technical/2017-December/124629.html
+
+--- a/source3/libads/kerberos_keytab.c
++++ b/source3/libads/kerberos_keytab.c
+@@ -32,8 +32,6 @@
+
+ #ifdef HAVE_KRB5
+
+-#ifdef HAVE_ADS
+-
+ /* This MAX_NAME_LEN is a constant defined in krb5.h */
+ #ifndef MAX_KEYTAB_NAME_LEN
+ #define MAX_KEYTAB_NAME_LEN 1100
+@@ -85,6 +83,8 @@
+ return ret;
+ }
+
++#ifdef HAVE_ADS
++
+ /**********************************************************************
+ Adds a single service principal, i.e. 'host' to the system keytab
+ ***********************************************************************/
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
new file mode 100644
index 00000000000..bcab7bd8aec
--- /dev/null
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/samba-4.0/policy.h
+ /usr/include/samba-4.0/dcerpc_server.h
+ /usr/include/samba-4.0/ctdb.h
+ /usr/include/samba-4.0/ctdb_client.h
+ /usr/include/samba-4.0/ctdb_protocol.h
+ /usr/include/samba-4.0/ctdb_private.h
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h
+ /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libaio[${MULTILIB_USEDEP}]
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/iniparser:0
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.2.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ pam? ( virtual/pam )
+ acl? ( virtual/acl )
+ addns? (
+ net-dns/bind-tools[gssapi]
+ dev-python/dnspython:=[${PYTHON_USEDEP}]
+ )
+ ceph? ( sys-cluster/ceph )
+ cluster? ( !dev-db/ctdb )
+ cups? ( net-print/cups )
+ debug? ( dev-util/lttng-ust )
+ dmapi? ( sys-apps/dmapi )
+ fam? ( virtual/fam )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+ system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+ test? (
+ !system-mitkrb5? (
+ >=sys-libs/nss_wrapper-1.1.3
+ >=net-dns/resolv_wrapper-1.1.4
+ >=net-libs/socket_wrapper-1.1.7
+ >=sys-libs/uid_wrapper-1.2.1
+ )
+ )"
+RDEPEND="${CDEPEND}
+ python? ( ${PYTHON_DEPS} )
+ client? ( net-fs/cifs-utils[ads?] )
+ selinux? ( sec-policy/selinux-samba )
+ !dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls )
+ test? ( python )
+ addns? ( python )
+ ads? ( acl gnutls ldap )
+ gpg? ( addc )
+ ?? ( system-heimdal system-mitkrb5 )
+ ${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}"/talloc-disable-python.patch
+ "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+ "${FILESDIR}/${P}-no_ads.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use cluster ; then
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # un-bundle dnspython
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+ # unbundle iso8601 unless tests are enabled
+ use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+ # ugly hackaround for bug #592502
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ fi
+
+ local myconf=()
+ myconf=(
+ --enable-fhs
+ --sysconfdir="${EPREFIX}/etc"
+ --localstatedir="${EPREFIX}/var"
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+ --with-piddir="${EPREFIX}/run/${PN}"
+ --bundled-libraries="${bundled_libs}"
+ --builtin-libraries=NONE
+ --disable-rpath
+ --disable-rpath-install
+ --nopyc
+ --nopyo
+ )
+ if multilib_is_native_abi ; then
+ myconf+=(
+ $(use_with acl acl-support)
+ $(usex addc '' '--without-ad-dc')
+ $(use_with addns dnsupdate)
+ $(use_with ads)
+ $(use_enable ceph cephfs)
+ $(use_with cluster cluster-support)
+ $(use_enable cups)
+ $(use_with debug lttng)
+ $(use_with dmapi)
+ $(use_with fam)
+ $(use_enable gnutls)
+ $(use_with gpg gpgme)
+ $(use_enable iprint)
+ $(use_with ldap)
+ $(use_with pam)
+ $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+ $(use_with quota quotas)
+ $(use_with syslog)
+ $(use_with systemd)
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '')
+ $(use_with winbind)
+ $(usex python '' '--disable-python')
+ $(usex test '--enable-selftest' '')
+ $(use_enable zeroconf avahi)
+ --with-shared-modules=${SHAREDMODS}
+ )
+ else
+ myconf+=(
+ --without-acl-support
+ --without-ad-dc
+ --without-dnsupdate
+ --without-ads
+ --disable-avahi
+ --disable-cephfs
+ --without-cluster-support
+ --disable-cups
+ --without-dmapi
+ --without-fam
+ --disable-gnutls
+ --without-gpgme
+ --disable-iprint
+ $(use_with ldap)
+ $(use_with debug lttng)
+ --without-pam
+ --without-quotas
+ --without-syslog
+ --without-systemd
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '')
+ --without-winbind
+ --disable-python
+ )
+ fi
+
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # Make all .so files executable
+ find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+ if multilib_is_native_abi; then
+ # install ldap schema for server (bug #491002)
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins examples/LDAP/samba.schema
+ fi
+
+ # create symlink for cups (bug #552310)
+ if use cups ; then
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ fi
+
+ # install example config file
+ insinto /etc/samba
+ doins examples/smb.conf.default
+
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
+ # Install init script and conf.d file
+ newinitd "${CONFDIR}/samba4.initd-r1" samba
+ newconfd "${CONFDIR}/samba4.confd" samba
+
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+ systemd_dounit "${FILESDIR}"/nmbd.service
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+ systemd_dounit "${FILESDIR}"/winbindd.service
+ systemd_dounit "${FILESDIR}"/samba.service
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ "${WAF_BINARY}" test || die "test failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Be aware the this release contains the best of all of Samba's"
+ ewarn "technology parts, both a file server (that you can reasonably expect"
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+ ewarn "controller work previously known as 'samba4'."
+
+ elog "For further information and migration steps make sure to read "
+ elog "http://samba.org/samba/history/${P}.html "
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+ elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2018-01-23 21:36 Mike Frysinger
0 siblings, 0 replies; 17+ messages in thread
From: Mike Frysinger @ 2018-01-23 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 1e37ae494f22a9770f779bb6d52da3c098309887
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Jan 23 21:34:04 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 21:36:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e37ae49
net-fs/samba: add upstream fix for cross-compiling
.../files/samba-4.7.3-krb-cross-compile.patch | 40 ++++++++++++++++++++++
net-fs/samba/samba-4.7.3.ebuild | 1 +
net-fs/samba/samba-4.7.4.ebuild | 1 +
3 files changed, 42 insertions(+)
diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
new file mode 100644
index 00000000000..9fad9fca44f
--- /dev/null
+++ b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
@@ -0,0 +1,40 @@
+https://lists.samba.org/archive/samba-technical/2017-December/124344.html
+https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836
+
+From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001
+From: Zentaro Kavanagh <zentaro@chromium.org>
+Date: Mon, 11 Dec 2017 12:41:16 -0800
+Subject: [PATCH] Remove unsupported colon from configure msg.
+
+- When cross-compiling an answers file must be supplied via
+ --cross-compile --cross-answers=<path to answers>.
+- The lines in the answer file have the form;
+ Config Msg: Answer
+- The colon is used to delimit the msg and the answer when reading
+ the answers file.
+- WAF doesn't support the message containing a colon.
+- It's not possible to override this variable so cross compile fails.
+
+Signed-off-by: Zentaro Kavanagh <zentaro@google.com>
+Reviewed-by: Uri Simchoni <uri@samba.org>
+Reviewed-by: Andrew Bartlett <abartlet@samba.org>
+---
+ wscript_configure_system_mitkrb5 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
+index 9c351131ad1a..803dad7ab63b 100644
+--- a/wscript_configure_system_mitkrb5
++++ b/wscript_configure_system_mitkrb5
+@@ -282,7 +282,7 @@ conf.CHECK_CODE('''
+ ''',
+ 'HAVE_WRFILE_KEYTAB',
+ headers='krb5.h', lib='krb5', execute=True,
+- msg="Checking whether the WRFILE:-keytab is supported");
++ msg="Checking whether the WRFILE -keytab is supported");
+ # Check for KRB5_DEPRECATED handling
+ conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
+ #include <krb5.h>''',
+--
+2.15.1
+
diff --git a/net-fs/samba/samba-4.7.3.ebuild b/net-fs/samba/samba-4.7.3.ebuild
index 5656d87fe61..96bd7cdf5f9 100644
--- a/net-fs/samba/samba-4.7.3.ebuild
+++ b/net-fs/samba/samba-4.7.3.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
"${FILESDIR}"/talloc-disable-python.patch
"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+ "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
index bcab7bd8aec..13fa3acc76c 100644
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
"${FILESDIR}"/talloc-disable-python.patch
"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+ "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
"${FILESDIR}/${P}-no_ads.patch"
)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2018-05-24 8:12 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2018-05-24 8:12 UTC (permalink / raw
To: gentoo-commits
commit: e10a559f239b6bde6df2ffaba367cdee60cfb657
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 08:11:19 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 24 08:11:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10a559f
net-fs/samba: Fixed build with USE="-ldap python".
Package-Manager: Portage-2.3.38, Repoman-2.3.9
.../files/samba-4.8-without_ads_build_fix.patch | 49 ++++++++++++++++++++++
net-fs/samba/samba-4.8.2.ebuild | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
new file mode 100644
index 00000000000..a2a4702d007
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
@@ -0,0 +1,49 @@
+From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl@samba.org>
+Date: Sat, 3 Feb 2018 07:07:55 +0100
+Subject: [PATCH] libgpo: Fix the build --without-ads
+
+Signed-off-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: David Disseldorp <ddiss@samba.org>
+
+Autobuild-User(master): David Disseldorp <ddiss@samba.org>
+Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331
+
+(cherry picked from commit a222b7506b53e689708834237f18877231dca589)
+---
+ libgpo/pygpo.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
+index 7a02a0d..b6b53b7 100644
+--- a/libgpo/pygpo.c
++++ b/libgpo/pygpo.c
+@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self,
+ return result;
+ }
+
++#ifdef HAVE_ADS
+ static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
+ const char *samaccountname,
+ uint32_t *uac_ret, const char **dn_ret)
+@@ -468,11 +469,15 @@ out:
+ return ret;
+ }
+
++#endif
++
+ static PyMethodDef ADS_methods[] = {
+ { "connect", (PyCFunction)py_ads_connect, METH_NOARGS,
+ "Connect to the LDAP server" },
++#ifdef HAVE_ADS
+ { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS,
+ NULL },
++#endif
+ { NULL }
+ };
+
+--
+1.9.1
+
diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild
index 3bfb4b1af5b..cd603d27bde 100644
--- a/net-fs/samba/samba-4.8.2.ebuild
+++ b/net-fs/samba/samba-4.8.2.ebuild
@@ -114,7 +114,6 @@ REQUIRED_USE="
ads? ( acl gnutls ldap winbind )
cluster? ( ads )
gpg? ( addc )
- python? ( ldap )
test? ( python )
?? ( system-heimdal system-mitkrb5 )
${PYTHON_REQUIRED_USE}
@@ -131,6 +130,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}/${PN}-4.8-without_ads_build_fix.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2018-11-08 17:51 Ian Stakenvicius
0 siblings, 0 replies; 17+ messages in thread
From: Ian Stakenvicius @ 2018-11-08 17:51 UTC (permalink / raw
To: gentoo-commits
commit: c3c0a86e506899288b9677d732d5394eb006b34e
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 8 17:50:06 2018 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Nov 8 17:51:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c0a86e
net-fs/samba: do not install python DSDB bits when USE=-addc
If ADDC is disabled, samba-4.8.6 was still installing python module
smbd_dns.so , which links to libdnsserver-common-samba4.so but the
latter is NOT installed. This causes infinite revdep-rebuild errors.
This commit patches the build system to prevent said file from being
installed. Bumped directly to stable by maintainers.
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
.../files/samba-4.8.6-no-pydsdb-when-no-addc.patch | 36 ++++++++++++++++++++++
.../{samba-4.8.6.ebuild => samba-4.8.6-r1.ebuild} | 0
2 files changed, 36 insertions(+)
diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
new file mode 100644
index 00000000000..1093b1de71d
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
@@ -0,0 +1,36 @@
+Do not install the python DSDB modules when ADDC is disabled.
+This is a change integrated upstream in 4.9.1 (or earlier).
+
+Without this, the python dsdb_dns.so module is installed, which
+is linked to libdnsserver-common.so that is NOT installed, and so
+potential breakage ensues.
+
+--- a/source4/dsdb/wscript_build 2018-01-17 03:08:39.000000000 -0500
++++ b/source4/dsdb/wscript_build 2018-11-08 10:43:58.064486832 -0500
+@@ -63,10 +63,11 @@
+ )
+
+ bld.SAMBA_PYTHON('python_dsdb',
+ source='pydsdb.c',
+ # the dependency on dcerpc here is because gensec
+ # depends on dcerpc but the waf circular dependency finder
+ # removes it so we end up with unresolved symbols.
+ deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones',
+- realname='samba/dsdb.so'
++ realname='samba/dsdb.so',
++ enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ )
+--- a/source4/dns_server/wscript_build 2018-11-08 11:49:03.450296286 -0500
++++ b/source4/dns_server/wscript_build 2018-11-08 11:49:23.327864408 -0500
+@@ -64,9 +64,10 @@
+ private_library=True,
+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
+
+
+ bld.SAMBA_PYTHON('python_dsdb_dns',
+ source='pydns.c',
+ deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util',
+- realname='samba/dsdb_dns.so')
++ realname='samba/dsdb_dns.so',
++ enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/net-fs/samba/samba-4.8.6.ebuild b/net-fs/samba/samba-4.8.6-r1.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.8.6.ebuild
rename to net-fs/samba/samba-4.8.6-r1.ebuild
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2019-04-09 6:05 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2019-04-09 6:05 UTC (permalink / raw
To: gentoo-commits
commit: fa902078740e4df285dd222d95352b6cebeb7fc5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 05:32:07 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 06:05:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa902078
net-fs/samba: Bump to versions 4.9.6 and 4.10.2
apply patch to v4.10.2 fixing builds with USE="-gnutls"
Bug: https://bugs.gentoo.org/675694
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-fs/samba/Manifest | 2 +
.../samba-4.10.0-disable_gnutls_build_fix.patch | 32 +++
net-fs/samba/samba-4.10.2.ebuild | 307 +++++++++++++++++++++
net-fs/samba/samba-4.9.6.ebuild | 305 ++++++++++++++++++++
4 files changed, 646 insertions(+)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8337a39063d..9f412a59f1e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,6 @@
DIST samba-4.10.0.tar.gz 18270804 BLAKE2B 53faf392aa4d09412f3d525410e290385f796dd7ef16e48d403ce8ff0466150312992c7459adee21ebf4c217c67a77d244b69f706dae16245058670a2ccd2087 SHA512 e82a8ec78cea666a653bddab066eaa22382f5b016b38f7618492e39f470d6f4c3ddd6dc21e9f0e9fde73ab98c4dd3da1a3823fd457f085ac14c36070b447ac90
DIST samba-4.10.1.tar.gz 18280677 BLAKE2B e14142d51e35d0745d21832825af59216032df5316db4adb39044e3121911ac06bc3d7070c9a03f7fdda03e18f537293e9e3a4c4a78bd1c3c93244d23171ca39 SHA512 cfd86999d2eacb7700f03a25112211f4c79f64685d758744f690046728b5f5d66e4699d6cc9dc3e1ae108eb630ed18d9f62791ca101daabcebafa3cca2b3d838
+DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
@@ -7,3 +8,4 @@ DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c2
DIST samba-4.8.9.tar.gz 17750151 BLAKE2B 09f350be7f262889708c1b8f779c0e003cc292e0de2afb19f35ec12d43c4c5874151e984699218a563a11eb24b13f1af33607d2accfe699fb0b5f6bdb1b9b367 SHA512 733eb769e21fc563d4deef17c54de025d05ceec85f8b16513bbeefdb3cb99c3611027e049014d3c29cb6463ce2660be92c97f8b5f741a6b67424c8f329a88ea4
DIST samba-4.9.4.tar.gz 18053738 BLAKE2B 337444e55fc8a8864e3960609719087e64e7d14faaf150c510b9011f67ffdc8a9bd6533c60be938e742db8a2e5401a065e7d14fae0480ee7a996a1f71ef0448d SHA512 ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617
DIST samba-4.9.5.tar.gz 18065757 BLAKE2B 541b2534cdfb94a155aee629645bb4f1cbe429c6cb4f3170973807c4c5d2728013137eb65e478da763169315e0fc720f5dc54a70f7f9dcce4e2d5b69271a82cd SHA512 0ce49721dcd1b16148448bdf516c42f8fdeb3cb48e7fa8113fac508f8585251ead23d5b679f99eb7925e7a6fbedc2da75d339946b0cecb15698f3ea0cb542750
+DIST samba-4.9.6.tar.gz 18068196 BLAKE2B 03a04abb430abc4b7ba6fc5ade8690c215948d24fe1044d79c2dd1f8242b6708f0618045e37ad73114413dcef70bcf45de15f358a0e012cecfea045b9ab9165c SHA512 462774e60f0165aa445821795c373ab6845ac2790578a68e84c0c82f761ddf29bf5186106a95f394e24b8ef7393d7abe003f95e72f5c5892bbf992f58e350531
diff --git a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch
new file mode 100644
index 00000000000..12b2df3a597
--- /dev/null
+++ b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch
@@ -0,0 +1,32 @@
+From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett <abartlet@samba.org>
+Date: Wed, 20 Mar 2019 13:57:50 +1300
+Subject: [PATCH] build: Allow build when --disable-gnutls is set
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844
+
+Signed-off-by: Andrew Bartlett <abartlet@samba.org>
+---
+ lib/mscat/wscript | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/mscat/wscript b/lib/mscat/wscript
+index 7ca9ef567ee..4d1f752a3c1 100644
+--- a/lib/mscat/wscript
++++ b/lib/mscat/wscript
+@@ -12,7 +12,11 @@ def configure(conf):
+ if not conf.find_program('asn1Parser', var='ASN1PARSER'):
+ Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)')
+
+- conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
++ # GnuTLS is currently able to be disabled
++ if conf.env.enable_gnutls:
++ conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
++ else:
++ Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built')
+
+ def build(bld):
+ if (bld.CONFIG_SET('HAVE_LIBTASN1') and
+--
+2.11.0
+
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
new file mode 100644
index 00000000000..4a4d425c969
--- /dev/null
+++ b/net-fs/samba/samba-4.10.2.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/samba-4.0/policy.h
+ /usr/include/samba-4.0/dcerpc_server.h
+ /usr/include/samba-4.0/ctdb.h
+ /usr/include/samba-4.0/ctdb_client.h
+ /usr/include/samba-4.0/ctdb_protocol.h
+ /usr/include/samba-4.0/ctdb_private.h
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h
+ /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libaio[${MULTILIB_USEDEP}]
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/iniparser:0
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ net-libs/libnsl:=[${MULTILIB_USEDEP}]
+ sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ pam? ( virtual/pam )
+ acl? ( virtual/acl )
+ addns? (
+ net-dns/bind-tools[gssapi]
+ dev-python/dnspython:=[${PYTHON_USEDEP}]
+ )
+ ceph? ( sys-cluster/ceph )
+ cluster? (
+ net-libs/rpcsvc-proto
+ !dev-db/ctdb
+ )
+ cups? ( net-print/cups )
+ debug? ( dev-util/lttng-ust )
+ dmapi? ( sys-apps/dmapi )
+ fam? ( virtual/fam )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
+ json? ( dev-libs/jansson )
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+ system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ net-libs/libtirpc[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
+ || (
+ net-libs/rpcsvc-proto
+ <sys-libs/glibc-2.26[rpc(+)]
+ )
+ test? (
+ !system-mitkrb5? (
+ >=sys-libs/nss_wrapper-1.1.3
+ >=net-dns/resolv_wrapper-1.1.4
+ >=net-libs/socket_wrapper-1.1.9
+ >=sys-libs/uid_wrapper-1.2.1
+ )
+ )"
+RDEPEND="${CDEPEND}
+ python? ( ${PYTHON_DEPS} )
+ client? ( net-fs/cifs-utils[ads?] )
+ selinux? ( sec-policy/selinux-samba )
+ !dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+ addc? ( python gnutls json winbind )
+ addns? ( python )
+ ads? ( acl gnutls ldap winbind )
+ cluster? ( ads )
+ gpg? ( addc )
+ test? ( python )
+ ?? ( system-heimdal system-mitkrb5 )
+ ${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}/${PN}-4.9.2-timespec.patch"
+ "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use cluster ; then
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # un-bundle dnspython
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+ # unbundle iso8601 unless tests are enabled
+ if ! use test ; then
+ sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+ fi
+
+ # ugly hackaround for bug #592502
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ fi
+
+ local myconf=(
+ --enable-fhs
+ --sysconfdir="${EPREFIX}/etc"
+ --localstatedir="${EPREFIX}/var"
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+ --with-piddir="${EPREFIX}/run/${PN}"
+ --bundled-libraries="${bundled_libs}"
+ --builtin-libraries=NONE
+ --disable-rpath
+ --disable-rpath-install
+ --nopyc
+ --nopyo
+ $(multilib_native_use_with acl acl-support)
+ $(multilib_native_usex addc '' '--without-ad-dc')
+ $(multilib_native_use_with addns dnsupdate)
+ $(multilib_native_use_with ads)
+ $(multilib_native_use_enable ceph cephfs)
+ $(multilib_native_use_with cluster cluster-support)
+ $(multilib_native_use_enable cups)
+ $(multilib_native_use_with dmapi)
+ $(multilib_native_use_with fam)
+ $(multilib_native_use_with gpg gpgme)
+ $(multilib_native_use_with json)
+ $(multilib_native_use_enable iprint)
+ $(multilib_native_use_with pam)
+ $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+ $(multilib_native_use_with quota quotas)
+ $(multilib_native_use_with syslog)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with winbind)
+ $(multilib_native_usex python '' '--disable-python')
+ $(multilib_native_use_enable zeroconf avahi)
+ $(multilib_native_usex test '--enable-selftest' '')
+ $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+ $(use_enable gnutls)
+ $(use_with debug lttng)
+ $(use_with ldap)
+ )
+
+ multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # Make all .so files executable
+ find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+ if multilib_is_native_abi ; then
+ # install ldap schema for server (bug #491002)
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins examples/LDAP/samba.schema
+ fi
+
+ # create symlink for cups (bug #552310)
+ if use cups ; then
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ fi
+
+ # install example config file
+ insinto /etc/samba
+ doins examples/smb.conf.default
+
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
+ # Install init script and conf.d file
+ newinitd "${CONFDIR}/samba4.initd-r1" samba
+ newconfd "${CONFDIR}/samba4.confd" samba
+
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+ systemd_dounit "${FILESDIR}"/nmbd.service
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+ systemd_dounit "${FILESDIR}"/winbindd.service
+ systemd_dounit "${FILESDIR}"/samba.service
+ fi
+
+ if use pam && use winbind ; then
+ newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+ # bugs #376853 and #590374
+ insinto /etc/security
+ doins examples/pam_winbind/pam_winbind.conf || die
+ fi
+
+ keepdir /var/cache/samba
+ keepdir /var/lib/ctdb
+ keepdir /var/lib/samba/{bind-dns,private}
+ keepdir /var/lock/samba
+ keepdir /var/log/samba
+ keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ "${WAF_BINARY}" test || die "test failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Be aware the this release contains the best of all of Samba's"
+ ewarn "technology parts, both a file server (that you can reasonably expect"
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+ ewarn "controller work previously known as 'samba4'."
+
+ elog "For further information and migration steps make sure to read "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.9.6.ebuild b/net-fs/samba/samba-4.9.6.ebuild
new file mode 100644
index 00000000000..6427d579620
--- /dev/null
+++ b/net-fs/samba/samba-4.9.6.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/samba-4.0/policy.h
+ /usr/include/samba-4.0/dcerpc_server.h
+ /usr/include/samba-4.0/ctdb.h
+ /usr/include/samba-4.0/ctdb_client.h
+ /usr/include/samba-4.0/ctdb_protocol.h
+ /usr/include/samba-4.0/ctdb_private.h
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h
+ /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libaio[${MULTILIB_USEDEP}]
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/iniparser:0
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ net-libs/libnsl:=[${MULTILIB_USEDEP}]
+ sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ pam? ( virtual/pam )
+ acl? ( virtual/acl )
+ addns? (
+ net-dns/bind-tools[gssapi]
+ dev-python/dnspython:=[${PYTHON_USEDEP}]
+ )
+ ceph? ( sys-cluster/ceph )
+ cluster? (
+ net-libs/rpcsvc-proto
+ !dev-db/ctdb
+ )
+ cups? ( net-print/cups )
+ debug? ( dev-util/lttng-ust )
+ dmapi? ( sys-apps/dmapi )
+ fam? ( virtual/fam )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
+ json? ( dev-libs/jansson )
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+ system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ net-libs/libtirpc[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
+ || (
+ net-libs/rpcsvc-proto
+ <sys-libs/glibc-2.26[rpc(+)]
+ )
+ test? (
+ !system-mitkrb5? (
+ >=sys-libs/nss_wrapper-1.1.3
+ >=net-dns/resolv_wrapper-1.1.4
+ >=net-libs/socket_wrapper-1.1.9
+ >=sys-libs/uid_wrapper-1.2.1
+ )
+ )"
+RDEPEND="${CDEPEND}
+ python? ( ${PYTHON_DEPS} )
+ client? ( net-fs/cifs-utils[ads?] )
+ selinux? ( sec-policy/selinux-samba )
+ !dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+ addc? ( python gnutls json winbind )
+ addns? ( python )
+ ads? ( acl gnutls ldap winbind )
+ cluster? ( ads )
+ gpg? ( addc )
+ test? ( python )
+ ?? ( system-heimdal system-mitkrb5 )
+ ${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+ "${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use cluster ; then
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # un-bundle dnspython
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+ # unbundle iso8601 unless tests are enabled
+ if ! use test ; then
+ sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+ fi
+
+ # ugly hackaround for bug #592502
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ fi
+
+ local myconf=(
+ --enable-fhs
+ --sysconfdir="${EPREFIX}/etc"
+ --localstatedir="${EPREFIX}/var"
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+ --with-piddir="${EPREFIX}/run/${PN}"
+ --bundled-libraries="${bundled_libs}"
+ --builtin-libraries=NONE
+ --disable-rpath
+ --disable-rpath-install
+ --nopyc
+ --nopyo
+ $(multilib_native_use_with acl acl-support)
+ $(multilib_native_usex addc '' '--without-ad-dc')
+ $(multilib_native_use_with addns dnsupdate)
+ $(multilib_native_use_with ads)
+ $(multilib_native_use_enable ceph cephfs)
+ $(multilib_native_use_with cluster cluster-support)
+ $(multilib_native_use_enable cups)
+ $(multilib_native_use_with dmapi)
+ $(multilib_native_use_with fam)
+ $(multilib_native_use_with gpg gpgme)
+ $(multilib_native_use_with json json-audit)
+ $(multilib_native_use_enable iprint)
+ $(multilib_native_use_with pam)
+ $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+ $(multilib_native_use_with quota quotas)
+ $(multilib_native_use_with syslog)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with winbind)
+ $(multilib_native_usex python '' '--disable-python')
+ $(multilib_native_use_enable zeroconf avahi)
+ $(multilib_native_usex test '--enable-selftest' '')
+ $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+ $(use_enable gnutls)
+ $(use_with debug lttng)
+ $(use_with ldap)
+ )
+ multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # Make all .so files executable
+ find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+ if multilib_is_native_abi ; then
+ # install ldap schema for server (bug #491002)
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins examples/LDAP/samba.schema
+ fi
+
+ # create symlink for cups (bug #552310)
+ if use cups ; then
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ fi
+
+ # install example config file
+ insinto /etc/samba
+ doins examples/smb.conf.default
+
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
+ # Install init script and conf.d file
+ newinitd "${CONFDIR}/samba4.initd-r1" samba
+ newconfd "${CONFDIR}/samba4.confd" samba
+
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+ systemd_dounit "${FILESDIR}"/nmbd.service
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+ systemd_dounit "${FILESDIR}"/winbindd.service
+ systemd_dounit "${FILESDIR}"/samba.service
+ fi
+
+ if use pam && use winbind ; then
+ newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+ # bugs #376853 and #590374
+ insinto /etc/security
+ doins examples/pam_winbind/pam_winbind.conf || die
+ fi
+
+ keepdir /var/cache/samba
+ keepdir /var/lib/ctdb
+ keepdir /var/lib/samba/{bind-dns,private}
+ keepdir /var/lock/samba
+ keepdir /var/log/samba
+ keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ "${WAF_BINARY}" test || die "test failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Be aware the this release contains the best of all of Samba's"
+ ewarn "technology parts, both a file server (that you can reasonably expect"
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+ ewarn "controller work previously known as 'samba4'."
+
+ elog "For further information and migration steps make sure to read "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2020-02-09 14:46 Ben Kohler
0 siblings, 0 replies; 17+ messages in thread
From: Ben Kohler @ 2020-02-09 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 47c6f114afc9699dd82de27d1ba7da529f9632ba
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 14:45:56 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 14:46:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c6f114
net-fs/samba: don't keepdir paths handled by tmpfilesd
Closes: https://bugs.gentoo.org/602352
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-fs/samba/files/samba.conf | 1 +
net-fs/samba/samba-4.11.6-r1.ebuild | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
index e0a6f325cf9..a7f4946fb07 100644
--- a/net-fs/samba/files/samba.conf
+++ b/net-fs/samba/files/samba.conf
@@ -1,2 +1,3 @@
D /run/samba 0755 root root
+D /run/ctdb 0755 root root
D /run/lock/samba 0755 root root
diff --git a/net-fs/samba/samba-4.11.6-r1.ebuild b/net-fs/samba/samba-4.11.6-r1.ebuild
index 02ee234b50e..90f425758cf 100644
--- a/net-fs/samba/samba-4.11.6-r1.ebuild
+++ b/net-fs/samba/samba-4.11.6-r1.ebuild
@@ -285,9 +285,7 @@ multilib_src_install() {
keepdir /var/cache/samba
keepdir /var/lib/ctdb
keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
keepdir /var/log/samba
- keepdir /var/run/{ctdb,samba}
}
multilib_src_install_all() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2021-05-22 20:12 Lars Wendler
0 siblings, 0 replies; 17+ messages in thread
From: Lars Wendler @ 2021-05-22 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 50cdf4f21369dc557d98b45c4aac192a38f8f77a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 19:01:11 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 22 20:12:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cdf4f2
net-fs/samba: pre-4.13.7 security cleanup
Bug: https://bugs.gentoo.org/778026
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-fs/samba/Manifest | 2 -
.../samba-4.13-vfs_snapper_configure_option.patch | 56 ----
net-fs/samba/files/samba-4.13-winexe_option.patch | 67 -----
net-fs/samba/files/samba-4.9.2-timespec.patch | 21 --
net-fs/samba/samba-4.12.15.ebuild | 329 ---------------------
net-fs/samba/samba-4.12.9-r1.ebuild | 329 ---------------------
6 files changed, 804 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c8db3cc9c69..01f4ae64c0b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,3 @@
-DIST samba-4.12.15.tar.gz 18259918 BLAKE2B 69ce22c6f8570d3b55f960bc9225af8867d731ec827e2723e233b65be3dd68710de9b15839aea80b6dc8cadc38608319d1d153ba78322f4cc503e7b6a7d9f6e1 SHA512 89852e541d08af399578d497c873271dbe1f88e96e60a7e186209d165ef1525a79e57b5d24ee312e44056bb9d1b9b4e2caa18a771a387edf776a05a133372d84
-DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
DIST samba-4.13.7.tar.gz 18432921 BLAKE2B 55e5a470a594bc56c942daa394e2d8e8b90dd0d1408236f7d69a60c609f1f4b1d5389209ef57e245ca326b271fba0b58fceea47681a90ab09828a4e68e40693a SHA512 eac0c0b60d50591ecd8e730bd6f24ec3d5731a9dd4172640259d841cca988f20265e5a57967a070713ab7b4bd95766a21247cc8e6b32177b79eb766520a3288a
DIST samba-4.13.8.tar.gz 18438995 BLAKE2B 55ec8f94fa238d67d4fde33addfe65d14fcca66c0b67c7d5866d150314be39e2844c69fb1ac2c410a6143f5a9aba168e396a3984e2083cf073ba2630e523a334 SHA512 b8704097b5c20f2d5eb04f41b4519205f1b554215b396e558715a3039aeaece6ad776928c9aa7be84a3bc98994cdfdb0b7e3787c31832eb0e025eb796fe06bae
DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
diff --git a/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch b/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch
deleted file mode 100644
index b4721199568..00000000000
--- a/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7ae03a19b3ca895ba5f97a6bd4f9539d8daa6e0a Mon Sep 17 00:00:00 2001
-From: Matt Taylor <liverbugg@rinux.org>
-Date: Mon, 11 May 2020 15:26:41 -0400
-Subject: [PATCH] build: add configure option to control vfs_snapper build
-
-vfs_snapper is currently built if dbus development headers / libraries
-are detected during configure. This commit adds new --disable-snapper
-and --enable-snapper (default) configure parameters. When enabled,
-configure will fail if the dbus development headers / libraries are
-missing.
-
-Signed-off-by: Matt Taylor <liverbugg@rinux.org>
-Reviewed-by: David Disseldorp <ddiss@samba.org>
-Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-
-Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
-Autobuild-Date(master): Mon May 25 01:16:46 UTC 2020 on sn-devel-184
----
- source3/wscript | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index 07991806c63..24ade3b0a2b 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -74,6 +74,7 @@ def options(opt):
-
- opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True)
- opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True)
-+ opt.samba_add_onoff_option('snapper', with_name="enable", without_name="disable", default=True)
-
- opt.add_option('--enable-vxfs',
- help=("enable support for VxFS (default=no)"),
-@@ -1752,11 +1753,16 @@ main() {
- if Options.options.enable_vxfs:
- conf.DEFINE('HAVE_VXFS', '1')
-
-- if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
-+ if Options.options.with_snapper:
-+ if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
- msg='Checking for dbus', uselib_store="DBUS-1"):
-- if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
-+ if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
- and conf.CHECK_LIB('dbus-1', shlib=True)):
-- conf.DEFINE('HAVE_DBUS', '1')
-+ conf.DEFINE('HAVE_DBUS', '1')
-+ else:
-+ conf.fatal("vfs_snapper is enabled but prerequisite DBUS libraries "
-+ "or headers not found. Use --disable-snapper to disable "
-+ "vfs_snapper support.");
-
- if conf.CHECK_CFG(package='liburing', args='--cflags --libs',
- msg='Checking for liburing package', uselib_store="URING"):
---
-2.26.2
-
diff --git a/net-fs/samba/files/samba-4.13-winexe_option.patch b/net-fs/samba/files/samba-4.13-winexe_option.patch
deleted file mode 100644
index 63f8a9ec41d..00000000000
--- a/net-fs/samba/files/samba-4.13-winexe_option.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 54c21a99e6ca54bdb963c70d322f6778b57a384f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
-Date: Wed, 4 Mar 2020 18:51:01 +0100
-Subject: [PATCH] winexe: add configure option to control whether to build it
- (default: auto)
-
-Guenther
-
-Signed-off-by: Guenther Deschner <gd@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-Autobuild-Date(master): Mon Mar 9 16:27:21 UTC 2020 on sn-devel-184
----
- examples/winexe/wscript_build | 3 ++-
- source3/wscript | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/examples/winexe/wscript_build b/examples/winexe/wscript_build
-index 43c09717e3d..559ed3fc706 100644
---- a/examples/winexe/wscript_build
-+++ b/examples/winexe/wscript_build
-@@ -106,4 +106,5 @@ if winexesvc_binaries != '':
- LOADPARM_CTX
- libsmb
- msrpc3
-- ''')
-+ ''',
-+ enabled=bld.env.build_winexe)
-diff --git a/source3/wscript b/source3/wscript
-index 85466b493fa..6d5bd22ca49 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -63,6 +63,7 @@ def options(opt):
- opt.samba_add_onoff_option('cluster-support', default=False)
-
- opt.samba_add_onoff_option('regedit', default=None)
-+ opt.samba_add_onoff_option('winexe', default=None)
-
- opt.samba_add_onoff_option('fake-kaserver',
- help=("Include AFS fake-kaserver support"), default=False)
-@@ -1782,6 +1783,22 @@ main() {
- if conf.CHECK_HEADERS('ftw.h') and conf.CHECK_FUNCS('nftw'):
- conf.env.build_mvxattr = True
-
-+ conf.env.build_winexe = False
-+ if not Options.options.with_winexe == False:
-+ if conf.CONFIG_SET('HAVE_WINEXE_CC_WIN32') or conf.CONFIG_SET('HAVE_WINEXE_CC_WIN64'):
-+ conf.env.build_winexe = True
-+
-+ if conf.env.build_winexe:
-+ Logs.info("building winexe")
-+ else:
-+ if Options.options.with_winexe == False:
-+ Logs.info("not building winexe (--without-winexe)")
-+ elif Options.options.with_winexe == True:
-+ Logs.error("mingw not available, cannot build winexe")
-+ conf.fatal("mingw not available, but --with-winexe was specified")
-+ else:
-+ Logs.info("mingw not available, not building winexe")
-+
- conf.CHECK_FUNCS_IN('DES_pcbc_encrypt', 'crypto')
- if Options.options.with_fake_kaserver == True:
- conf.CHECK_HEADERS('afs/param.h afs/stds.h', together=True)
---
-2.26.2
-
diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch
deleted file mode 100644
index c82f4af4e7e..00000000000
--- a/net-fs/samba/files/samba-4.9.2-timespec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001
-From: Joan Karadimov <joan@profuzdigital.com>
-Date: Thu, 18 Oct 2018 18:16:17 +0300
-Subject: [PATCH] Fix compatibility issues with the timespec struct
-
----
- source3/include/libsmbclient.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
-index 5e4a1715402..6487ea7a8aa 100644
---- a/source3/include/libsmbclient.h
-+++ b/source3/include/libsmbclient.h
-@@ -78,6 +78,7 @@ extern "C" {
- #include <sys/statvfs.h>
- #include <stdint.h>
- #include <fcntl.h>
-+#include <time.h>
- #include <utime.h>
-
- #define SMBC_BASE_FD 10000 /* smallest file descriptor returned */
diff --git a/net-fs/samba/samba-4.12.15.ebuild b/net-fs/samba/samba-4.12.15.ebuild
deleted file mode 100644
index 45fc3a27650..00000000000
--- a/net-fs/samba/samba-4.12.15.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.1.5[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
- acl? ( virtual/acl )
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- !system-mitkrb5? (
- >=sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
-"
-
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- ntvfs? ( addc )
- spotlight? ( json )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
- "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
-
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable snapper)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild
deleted file mode 100644
index 76829ea314e..00000000000
--- a/net-fs/samba/samba-4.12.9-r1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( sys-libs/pam )
- acl? ( virtual/acl )
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- !system-mitkrb5? (
- >=sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
-"
-
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- ntvfs? ( addc )
- spotlight? ( json )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
- "${FILESDIR}/${PN}-4.13-winexe_option.patch"
- "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
-
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with ntvfs ntvfs-fileserver)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable snapper)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2022-06-24 5:26 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-06-24 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 9923d7331d1189316726fcab47ba89a2623f82ab
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Jun 21 05:48:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 05:26:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9923d733
net-fs/samba: Apply the netdb defines patch
NETDB_INTERNAL and NETDB_INTERNAL are not defined in musl as a result
the build is failing.
Acked-by: David Seifert <soap <AT> gentoo.org>
Closes: https://bugs.gentoo.org/835017
Closes: https://bugs.gentoo.org/832629
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26016
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-fs/samba/files/samba-4.16.1-netdb-defines.patch | 21 +++++++++++++++++++++
net-fs/samba/samba-4.16.1.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/net-fs/samba/files/samba-4.16.1-netdb-defines.patch b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch
new file mode 100644
index 000000000000..40aeaa22bfae
--- /dev/null
+++ b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch
@@ -0,0 +1,21 @@
+# Define NETDB_INTERNAL and NETDB_SUCCESS if they are not defined
+#
+# Gentoo bug 832629 and 835017
+
+--- a/nsswitch/wins.c
++++ b/nsswitch/wins.c
+@@ -40,6 +40,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #define INADDRSZ 4
+ #endif
+
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL -1
++#endif
++
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS 0
++#endif
++
+ _PUBLIC_ON_LINUX_
+ NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
+ struct hostent *he,
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1.ebuild
index a7d3fa8bb5d3..8b16a80d66cb 100644
--- a/net-fs/samba/samba-4.16.1.ebuild
+++ b/net-fs/samba/samba-4.16.1.ebuild
@@ -141,6 +141,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2022-07-29 18:12 Ben Kohler
0 siblings, 0 replies; 17+ messages in thread
From: Ben Kohler @ 2022-07-29 18:12 UTC (permalink / raw
To: gentoo-commits
commit: ffa408b3d9e5462d6b8233309eedbd1e6781b236
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 18:10:58 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 18:12:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa408b3
net-fs/samba: add tevent detection patch
Closes: https://bugs.gentoo.org/590026
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch | 12 ++++++++++++
net-fs/samba/samba-4.14.14.ebuild | 1 +
net-fs/samba/samba-4.15.9.ebuild | 1 +
net-fs/samba/samba-4.16.4.ebuild | 1 +
4 files changed, 15 insertions(+)
diff --git a/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
new file mode 100644
index 000000000000..4578435064b0
--- /dev/null
+++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
@@ -0,0 +1,12 @@
+--- ldb-1.3.6/lib/tevent/wscript
++++ ldb-1.3.6/lib/tevent/wscript
+@@ -34,8 +34,7 @@
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
+ onlyif='talloc', implied_deps='replace talloc'):
+ conf.define('USING_SYSTEM_TEVENT', 1)
+- if not conf.env.disable_python and \
+- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
++ if not conf.env.disable_python:
+ conf.define('USING_SYSTEM_PYTEVENT', 1)
+
+ if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
diff --git a/net-fs/samba/samba-4.14.14.ebuild b/net-fs/samba/samba-4.14.14.ebuild
index d7e8bd93a28f..860cd1aeb3f2 100644
--- a/net-fs/samba/samba-4.14.14.ebuild
+++ b/net-fs/samba/samba-4.14.14.ebuild
@@ -143,6 +143,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9.ebuild
index a2c269deaa76..2ba0530bb6ae 100644
--- a/net-fs/samba/samba-4.15.9.ebuild
+++ b/net-fs/samba/samba-4.15.9.ebuild
@@ -140,6 +140,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4.ebuild
index 6aa50af58785..02f5797dfdc2 100644
--- a/net-fs/samba/samba-4.16.4.ebuild
+++ b/net-fs/samba/samba-4.16.4.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2022-09-30 2:46 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-09-30 2:46 UTC (permalink / raw
To: gentoo-commits
commit: e24041ef403ad622cc187eea98e42b0fa291cf11
Author: Fco Javier Felix <ffelix <AT> inode64 <DOT> com>
AuthorDate: Sat Sep 24 06:30:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 02:46:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24041ef
net-fs/samba: Make libunwind optional (fix automagic dep)
It's only for debug and backtraces.
Backport from samba-4.17, Look at the bugs in:
https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f
https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd
See: https://github.com/gentoo/gentoo/pull/24280
Closes: https://bugs.gentoo.org/791349
Closes: https://github.com/gentoo/gentoo/pull/27422
Package-Manager: Portage-3.0.36, pkgcheck-0.10.14
Signed-off-by: Fco Javier Felix <web <AT> inode64.com>
Signed-off-by: Fco Javier Felix <ffelix <AT> inode64.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/samba-4.15.9-libunwind-automagic.patch | 118 +++++++++++++++++++++
net-fs/samba/metadata.xml | 1 +
...{samba-4.15.9.ebuild => samba-4.15.9-r1.ebuild} | 11 +-
...mba-4.16.0-r1.ebuild => samba-4.16.0-r2.ebuild} | 11 +-
...{samba-4.16.1.ebuild => samba-4.16.1-r1.ebuild} | 11 +-
...{samba-4.16.2.ebuild => samba-4.16.2-r1.ebuild} | 11 +-
...{samba-4.16.4.ebuild => samba-4.16.4-r1.ebuild} | 11 +-
7 files changed, 159 insertions(+), 15 deletions(-)
diff --git a/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch
new file mode 100644
index 000000000000..c3a2c802e6e9
--- /dev/null
+++ b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch
@@ -0,0 +1,118 @@
+https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd
+https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f
+https://bugs.gentoo.org/791349
+
+From 14feb93d481011765f62614ab49b304e17e4f6fd Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett <abartlet@samba.org>
+Date: Tue, 7 Jun 2022 15:07:59 +1200
+Subject: [PATCH] lib/util: Prefer backtrace_symbols() for internal backtraces
+
+Backtraces when Samba is in PANIC state are better with
+backtrace_symbols() than with libunwind on Ubuntu 20.04 x86_64
+so move libunwind to a off-by-default option, prompted for
+if backtrace_symbols() is not available.
+
+Based on a request by Fco Javier Felix <ffelix@inode64.com>
+
+Signed-off-by: Andrew Bartlett <abartlet@samba.org>
+Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
+--- a/lib/util/fault.c
++++ b/lib/util/fault.c
+@@ -222,9 +222,13 @@ _PUBLIC_ void smb_panic(const char *why)
+ void log_stack_trace(void)
+ {
+ #ifdef HAVE_LIBUNWIND
+- /* Try to use libunwind before any other technique since on ia64
+- * libunwind correctly walks the stack in more circumstances than
+- * backtrace.
++ /*
++ * --with-libunwind is required to use libunwind, the
++ * backtrace_symbols() code below is the default.
++ *
++ * This code is available because a previous version of this
++ * comment asserted that on ia64 libunwind correctly walks the
++ * stack in more circumstances than backtrace.
+ */
+ unw_cursor_t cursor;
+ unw_context_t uc;
+--- a/lib/util/wscript
++++ b/lib/util/wscript
+@@ -2,6 +2,15 @@ def options(opt):
+ ''' This is a bit strange, but disable is the flag, not enable. '''
+ opt.add_option('--disable-fault-handling', action='store_true', dest='disable_fault_handling', help=('disable the fault handlers'), default=False)
+
++ # We do not want libunwind by default (backtrace_symbols() in
++ # glibc is better) but allow (eg) IA-64 to build with it where it
++ # might be better (per old comment in fault.c)
++ opt.samba_add_onoff_option('libunwind',
++ default=None,
++ help='''Use libunwind instead of the default backtrace_symbols()
++ from libc, for example on IA-64 where it might give a better
++ backtrace.''')
++
+ opt.add_option('--with-systemd',
+ help=("Enable systemd integration"),
+ action='store_true', dest='enable_systemd')
+--- a/lib/util/wscript_configure
++++ b/lib/util/wscript_configure
+@@ -1,23 +1,35 @@
+ #!/usr/bin/env python
+-from waflib import Logs, Options
++from waflib import Logs, Options, Errors
+
+ import os, sys
+
+ if Options.options.disable_fault_handling:
+ conf.DEFINE('HAVE_DISABLE_FAULT_HANDLING',1)
+
+-# backtrace could be in libexecinfo or in libc
++# backtrace could be in libexecinfo or in libc.
++# This is our preferred backtrace handler (more useful output than libunwind as at Ubuntu 20.04 x86_64)
+ conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h')
+ conf.CHECK_HEADERS('execinfo.h')
+
+ conf.SET_TARGET_TYPE('LIBUNWIND', 'EMPTY')
+-if conf.check_cfg(package='libunwind-generic',
+- args='--cflags --libs',
+- msg='Checking for libunwind',
+- uselib_store='LIBUNWIND',
+- mandatory=False):
+- if conf.CHECK_HEADERS('libunwind.h'):
+- conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB')
++if Options.options.with_libunwind:
++ if conf.check_cfg(package='libunwind-generic',
++ args='--cflags --libs',
++ msg='Checking for libunwind',
++ uselib_store='LIBUNWIND',
++ mandatory=False):
++ if conf.CHECK_HEADERS('libunwind.h'):
++ conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB')
++ else:
++ raise Errors.WafError('--with-libunwind specified but libunwind not found')
++elif Options.options.with_libunwind == None:
++ if not conf.CONFIG_SET('HAVE_BACKTRACE_SYMBOLS') \
++ and not Options.options.disable_fault_handling:
++ raise Errors.WafError(
++'''backtrace_symbols() not found but
++--with-libunwind not specified.
++Use --without-libunwind to build without internal backtrace support or
++--disable-fault-handling to totally defer fault handling to the OS.''')
+
+ conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h')
+
+--- a/script/autobuild.py
++++ b/script/autobuild.py
+@@ -480,10 +480,11 @@ tasks = {
+ # MIT Kerberos from the current system. Runtime behaviour is
+ # confirmed via the ktest (static ccache and keytab) environment
+
++ # This environment also used to confirm we can still build with --with-libunwind
+ "samba-ktest-mit": {
+ "sequence": [
+ ("random-sleep", random_sleep(300, 900)),
+- ("configure", "./configure.developer --without-ad-dc --with-system-mitkrb5 " + samba_configure_params),
++ ("configure", "./configure.developer --without-ad-dc --with-libunwind --with-system-mitkrb5 " + samba_configure_params),
+ ("make", "make -j"),
+ ("test", make_test(include_envs=[
+ "ktest", # ktest is also tested in fileserver, samba and
+GitLab
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 0430625e206a..eedfdee5aad4 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -29,6 +29,7 @@
bundled heimdal.</flag>
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
<pkg>app-crypt/heimdal</pkg>.</flag>
+ <flag name="unwind">Enable libunwind usage for backtraces</flag>
<flag name="winbind">Enables support for the winbind auth daemon</flag>
</use>
<upstream>
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9-r1.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.15.9.ebuild
rename to net-fs/samba/samba-4.15.9-r1.ebuild
index 3ea8aa274e59..6042a3515c40 100644
--- a/net-fs/samba/samba-4.15.9.ebuild
+++ b/net-fs/samba/samba-4.15.9-r1.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -87,7 +87,6 @@ COMMON_DEPEND="
net-dns/bind-tools[gssapi]
)
")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
acl? ( virtual/acl )
ceph? ( sys-cluster/ceph )
cluster? ( net-libs/rpcsvc-proto )
@@ -108,6 +107,10 @@ COMMON_DEPEND="
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${COMMON_DEPEND}
@@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -229,6 +233,7 @@ multilib_src_configure() {
$(multilib_native_use_with systemd)
--systemd-install-services
--with-systemddir="$(systemd_get_systemunitdir)"
+ $(multilib_native_use_with unwind libunwind)
$(multilib_native_use_with winbind)
$(multilib_native_usex python '' '--disable-python')
$(multilib_native_use_enable zeroconf avahi)
diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild b/net-fs/samba/samba-4.16.0-r2.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.16.0-r1.ebuild
rename to net-fs/samba/samba-4.16.0-r2.ebuild
index a7d3fa8bb5d3..5e93ab77f6a8 100644
--- a/net-fs/samba/samba-4.16.0-r1.ebuild
+++ b/net-fs/samba/samba-4.16.0-r2.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -87,7 +87,6 @@ COMMON_DEPEND="
net-dns/bind-tools[gssapi]
)
")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
acl? ( virtual/acl )
ceph? ( sys-cluster/ceph )
cluster? ( net-libs/rpcsvc-proto )
@@ -108,6 +107,10 @@ COMMON_DEPEND="
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${COMMON_DEPEND}
@@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -229,6 +233,7 @@ multilib_src_configure() {
$(multilib_native_use_with systemd)
--systemd-install-services
--with-systemddir="$(systemd_get_systemunitdir)"
+ $(multilib_native_use_with unwind libunwind)
$(multilib_native_use_with winbind)
$(multilib_native_usex python '' '--disable-python')
$(multilib_native_use_enable zeroconf avahi)
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1-r1.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.16.1.ebuild
rename to net-fs/samba/samba-4.16.1-r1.ebuild
index 8b16a80d66cb..0c212106d9e4 100644
--- a/net-fs/samba/samba-4.16.1.ebuild
+++ b/net-fs/samba/samba-4.16.1-r1.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -87,7 +87,6 @@ COMMON_DEPEND="
net-dns/bind-tools[gssapi]
)
")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
acl? ( virtual/acl )
ceph? ( sys-cluster/ceph )
cluster? ( net-libs/rpcsvc-proto )
@@ -108,6 +107,10 @@ COMMON_DEPEND="
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${COMMON_DEPEND}
@@ -142,6 +145,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -230,6 +234,7 @@ multilib_src_configure() {
$(multilib_native_use_with systemd)
--systemd-install-services
--with-systemddir="$(systemd_get_systemunitdir)"
+ $(multilib_native_use_with unwind libunwind)
$(multilib_native_use_with winbind)
$(multilib_native_usex python '' '--disable-python')
$(multilib_native_use_enable zeroconf avahi)
diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2-r1.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.16.2.ebuild
rename to net-fs/samba/samba-4.16.2-r1.ebuild
index e5115c4e9c41..994f304e789e 100644
--- a/net-fs/samba/samba-4.16.2.ebuild
+++ b/net-fs/samba/samba-4.16.2-r1.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -87,7 +87,6 @@ COMMON_DEPEND="
net-dns/bind-tools[gssapi]
)
")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
acl? ( virtual/acl )
ceph? ( sys-cluster/ceph )
cluster? ( net-libs/rpcsvc-proto )
@@ -108,6 +107,10 @@ COMMON_DEPEND="
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${COMMON_DEPEND}
@@ -143,6 +146,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -232,6 +236,7 @@ multilib_src_configure() {
$(multilib_native_use_with systemd)
--systemd-install-services
--with-systemddir="$(systemd_get_systemunitdir)"
+ $(multilib_native_use_with unwind libunwind)
$(multilib_native_use_with winbind)
$(multilib_native_usex python '' '--disable-python')
$(multilib_native_use_enable zeroconf avahi)
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4-r1.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.16.4.ebuild
rename to net-fs/samba/samba-4.16.4-r1.ebuild
index ae46c2cab18c..6dc422deafb4 100644
--- a/net-fs/samba/samba-4.16.4.ebuild
+++ b/net-fs/samba/samba-4.16.4-r1.ebuild
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -87,7 +87,6 @@ COMMON_DEPEND="
net-dns/bind-tools[gssapi]
)
")
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
acl? ( virtual/acl )
ceph? ( sys-cluster/ceph )
cluster? ( net-libs/rpcsvc-proto )
@@ -108,6 +107,10 @@ COMMON_DEPEND="
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )
+ unwind? (
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${COMMON_DEPEND}
@@ -145,6 +148,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
"${FILESDIR}/${P}-glibc-2.36.patch"
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -234,6 +238,7 @@ multilib_src_configure() {
$(multilib_native_use_with systemd)
--systemd-install-services
--with-systemddir="$(systemd_get_systemunitdir)"
+ $(multilib_native_use_with unwind libunwind)
$(multilib_native_use_with winbind)
$(multilib_native_usex python '' '--disable-python')
$(multilib_native_use_enable zeroconf avahi)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2022-10-27 4:48 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-10-27 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 8c53aba416a2a2b6d6947e7cd3f8912f51678a50
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 04:24:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 04:46:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c53aba4
net-fs/samba: drop 4.16.4-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-fs/samba/Manifest | 1 -
net-fs/samba/files/samba-4.16.4-glibc-2.36.patch | 51 ----
net-fs/samba/samba-4.16.4-r1.ebuild | 338 -----------------------
3 files changed, 390 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 1009c7746975..f815b935159e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,5 +3,4 @@ DIST samba-4.14.14.tar.gz 19174363 BLAKE2B 5714ab40bc22d2692c81502fd6b05e2220998
DIST samba-4.15.10.tar.gz 19333317 BLAKE2B 20b414d51f915cfdcd50a10dd9d315d3be23a43d35051aa6ff8cdc3c07f430d96d933765a96882db0350792e740a4a4a18963cb7e8baa198c606180b9da273c3 SHA512 68e0096df9e348fdf389a11433391cd85606f075e9402ce64f2228daf126d794caf0050463eb2245933551b299735b25d5d5036c4ac78aba3e23c2fc2dce9ef6
DIST samba-4.15.7.tar.gz 19290930 BLAKE2B 4a295f79d38212d4c6917ed61a22e4204b5ea3d5e26f30b65d1e7e81842e92405870dd40fd4d05ec1126a532bdb1ddea300848387a4c64370ba5c2c1354ee8e5 SHA512 beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4
DIST samba-4.15.9.tar.gz 19324742 BLAKE2B 36cca5ac1b449339f2ce420d4f29f25151bcd536556bfc571db6422a95e9c5daed98b9a71387babbfc61d43e5ff183a1b69255dbec966f80a1cb8fe0ad40f636 SHA512 2ee5d66f5a7c1ff5b27c959be6310335eb6484476c1eadb3b8ca1bc84fb2260487136c1318539e1dc459b81bca66f268fd979f6a816ff5f905bd605a99685004
-DIST samba-4.16.4.tar.gz 30605121 BLAKE2B e685511a76770272cabd1292f36d2b005e2d21212e4782cdf4fd05039f7667b35501873cffa9a53547d523805b2a91ffeba0881aaee905304968c42efef22dfa SHA512 9754275ace30755b75f747e201f8ad4550a823c8606e550c0ce6b3ccbaf048dd895bf2c21127271298304be7f80de9b6451091c4949ebe267ee1cf3ab497cd85
DIST samba-4.16.5.tar.gz 30613439 BLAKE2B 7f6eabb8817d0101d7f95b668ea352fe3a2a9291814b42a303ea89dd19b1bd192e719930485d721b90dcedb180e86e42a87083ae42166bf5b07e8383c85436c6 SHA512 9c4cd2ccbb6a4910d0da220e24bf3bf2cf25acaaebb5aa7358d8910016fac29b8ed1889f8ee0b4953d695583ff04d8de7bfffc2d97ae30aa7730e157aa7acfcf
diff --git a/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch b/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch
deleted file mode 100644
index 7d3d231f50c9..000000000000
--- a/net-fs/samba/files/samba-4.16.4-glibc-2.36.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gitlab.com/samba-team/samba/-/commit/df7d6f0c48612feea428643006d32c2292c662e2
-https://bugs.gentoo.org/863830
-
-From: Andreas Schneider <asn@samba.org>
-Date: Tue, 2 Aug 2022 07:55:46 +0200
-Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems
-
-Details at:
-https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Ralph Boehme <slow@samba.org>
-(cherry picked from commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0)
-
-Autobuild-User(v4-16-test): Jule Anger <janger@samba.org>
-Autobuild-Date(v4-16-test): Tue Aug 23 08:53:41 UTC 2022 on sn-devel-184
---- a/lib/replace/system/filesys.h
-+++ b/lib/replace/system/filesys.h
-@@ -36,7 +36,8 @@
- #include <sys/param.h>
- #endif
-
--#ifdef HAVE_SYS_MOUNT_H
-+/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */
-+#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H)
- #include <sys/mount.h>
- #endif
-
-@@ -44,6 +45,7 @@
- #include <mntent.h>
- #endif
-
-+/* This include is required on Linux for statfs() */
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
---- a/lib/replace/wscript
-+++ b/lib/replace/wscript
-@@ -31,6 +31,9 @@ def configure(conf):
-
- conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
-
-+ if sys.platform.rfind('linux') > -1:
-+ conf.DEFINE('LINUX', '1')
-+
- conf.DEFINE('BOOL_DEFINED', 1)
- conf.DEFINE('HAVE_LIBREPLACE', 1)
- conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
-GitLab
diff --git a/net-fs/samba/samba-4.16.4-r1.ebuild b/net-fs/samba/samba-4.16.4-r1.ebuild
deleted file mode 100644
index 6dc422deafb4..000000000000
--- a/net-fs/samba/samba-4.16.4-r1.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
- SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- addc? ( python json winbind )
- ads? ( acl ldap python winbind )
- cluster? ( ads )
- gpg? ( addc )
- spotlight? ( json )
- test? ( python )
- !ads? ( !addc )
- ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.5.2[ldap(+)?,${MULTILIB_USEDEP}]
- <sys-libs/ldb-2.6.0[ldap(+)?,${MULTILIB_USEDEP}]
- sys-libs/libcap[${MULTILIB_USEDEP}]
- sys-libs/liburing:=[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- virtual/libiconv
- $(python_gen_cond_dep "
- addc? (
- dev-python/dnspython:=[\${PYTHON_USEDEP}]
- dev-python/markdown[\${PYTHON_USEDEP}]
- )
- ads? (
- dev-python/dnspython:=[\${PYTHON_USEDEP}]
- net-dns/bind-tools[gssapi]
- )
- ")
- acl? ( virtual/acl )
- ceph? ( sys-cluster/ceph )
- cluster? ( net-libs/rpcsvc-proto )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme:= )
- json? ( dev-libs/jansson:= )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? (
- sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
- sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
- )
- snapper? ( sys-apps/dbus )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- unwind? (
- llvm-libunwind? ( sys-libs/llvm-libunwind:= )
- !llvm-libunwind? ( sys-libs/libunwind:= )
- )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- dev-perl/JSON
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- spotlight? ( dev-libs/glib )
- test? (
- $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
- !system-mitkrb5? (
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/nss_wrapper-1.1.3
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${COMMON_DEPEND}
- client? ( net-fs/cifs-utils[ads?] )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
- "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
- "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
- "${FILESDIR}/${P}-glibc-2.36.patch"
- "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- # Package fails to build with distcc
- export DISTCC_DISABLE=1
- export PYTHONHASHSEED=1
-
- python-single-r1_pkg_setup
-
- SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
- if use cluster ; then
- SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS+=",idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- --accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- --without-dmapi
- $(multilib_native_use_with fam)
- $(multilib_native_use_enable glusterfs)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with regedit)
- $(multilib_native_use_enable spotlight)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with unwind libunwind)
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- if multilib_is_native_abi ; then
- myconf+=( --with-shared-modules=${SHAREDMODS} )
- else
- myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
- fi
-
- CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool \
- /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- dotmpfiles "${FILESDIR}"/samba.conf
- if ! use addc ; then
- rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
- || die
- fi
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process samba.conf
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-10-27 4:48 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-25 20:52 [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-10-27 4:48 Sam James
2022-09-30 2:46 Sam James
2022-07-29 18:12 Ben Kohler
2022-06-24 5:26 Sam James
2021-05-22 20:12 Lars Wendler
2020-02-09 14:46 Ben Kohler
2019-04-09 6:05 Lars Wendler
2018-11-08 17:51 Ian Stakenvicius
2018-05-24 8:12 Lars Wendler
2018-01-23 21:36 Mike Frysinger
2017-11-13 15:49 Lars Wendler
2017-08-11 21:23 Ian Stakenvicius
2017-01-19 2:44 Lars Wendler
2016-04-13 5:42 Sergey Popov
2016-01-13 22:40 Ian Stakenvicius
2016-01-05 22:58 Victor Ostorga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox