Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
Date: Mon, 03 Apr 2017 08:51:26
Message-Id: 1491209475.7b0d98180d7a22df756a0c0064d1e19fe406db3b.polynomial-c@gentoo
1 commit: 7b0d98180d7a22df756a0c0064d1e19fe406db3b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 3 08:50:18 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 3 08:51:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0d9818
7
8 net-fs/samba: Bump to versions 4.5.8 and 4.6.2
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-fs/samba/Manifest | 2 +
13 .../{samba-4.6.1.ebuild => samba-4.5.8.ebuild} | 53 ++++------------------
14 net-fs/samba/samba-4.6.1.ebuild | 2 +-
15 .../{samba-4.6.1.ebuild => samba-4.6.2.ebuild} | 2 +-
16 4 files changed, 14 insertions(+), 45 deletions(-)
17
18 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
19 index 5cd12965b66..1ffe6f5262a 100644
20 --- a/net-fs/samba/Manifest
21 +++ b/net-fs/samba/Manifest
22 @@ -2,9 +2,11 @@ DIST samba-4.2.11.tar.gz 20875348 SHA256 75bce53c922e51352933c9846f2c4b1e251fabb
23 DIST samba-4.2.14.tar.gz 20883281 SHA256 db820a9947e44f04b0eb25e4aa0c3db32c4042fca541775ee8e2905093e888e6 SHA512 269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890 WHIRLPOOL 925369c2f9c222d718bf4aacc7b1a83b8275acd96bbc1eca52ad96c86847327807560674ee9b180173d17a1e6109307ec4f70f1acbebe2efc8a9e67f2141e17d
24 DIST samba-4.5.6.tar.gz 20978580 SHA256 0d8ff81ef034344d09c9614fae7a2ad19cf7b175eb080e8548aa7783040ade70 SHA512 089ffbeae5d967ad1c805db55f2778dd4cc23083ed732df04a6f1f9d9bd734004002e93c9f1dd3128cf363a26060d0baf30256a0ba78f797cd340ae478e2c0b0 WHIRLPOOL 03c6cd57e76bbfc8b2f6bcd2893376687063c0e3455e00646e71e32cb0c908d5e2bc8a33344cc9252cf466345bd8121e715e029f12d5ba10203dd5e302811ab5
25 DIST samba-4.5.7.tar.gz 20981612 SHA256 ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 SHA512 3515ab133470b902e35e77f43639881af87643adeb7b3f43f319a684bff9db2e2d5acffbd67d69d910c270f6676a2cbcc25730fc27015a00cb9d44154e60cf2d WHIRLPOOL 016c2163162ed3ab126c16c47de4dc21b0d2b1116b207fc9359510a323e81d6d502f99b46885c6fee0cf8dd19c3ed5df5275eea79b47c3b0fc0ce935f3ec7db2
26 +DIST samba-4.5.8.tar.gz 20979104 SHA256 f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 SHA512 8855af32632d517ea5ce86f8ce4a73367fba8ff2e7155f4ed14483cf7a0922f0e0df8fd1e5bc04cee67093fce8b92b6fa18844e6383c0099cce1d5042f004438 WHIRLPOOL 86018efcc8e505c3d6d50806d7e20a6925941a80bd42568b50155f714f5717d1ed9f68a37faa10fe037bf67971c6573de9dbe71a852a064bfde6aaee93ba173e
27 DIST samba-4.6.0-disable-python-patches.tar.xz 7544 SHA256 508adeea65604ef8f4da006504de7c27bed56d7003db1166dc5d3b01f5a6be6e SHA512 07de2c0877aff31069ed0ab4fbe1c2272c854ae898ee5300a3b176ba31a218b05acff0b5120a5da0995592e7877c607865d2194c992df17b27c993836f58a654 WHIRLPOOL 12888f2ebf8d4ed5619860b2e6929599022b8ab1245970a5e1258f26e89aca1f87ab58fa54c7300dbd79a0c8fd6955e12c8aca6eeca246cdf06661d53ca3f6dd
28 DIST samba-4.6.0.tar.gz 21090602 SHA256 a3b3592e63d7064cae2624991f4925a443f3846c0dabb7011aee052c3fd4cc2b SHA512 734582b540ba25ea73c5bf8b0801c01808eaea4a0d96b6b26c5ac18bcc4eb4fa42c9d3484891c577f80453bf9f7e5fe7c56b0ec7148e5c0dad0279889b9af93a WHIRLPOOL f20991345b490d78386a33c867f843e9151930f80997d4a00e0ef924bf6b1ea3fcc6a7786b6f153073213b530225108e012882f74c1a24398587827d0dffc672
29 DIST samba-4.6.1.tar.gz 21097666 SHA256 5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e SHA512 8c759bb6483f67d632f35d779bf1afb44907fd478e3e5919fc95f36dd198e393819ed419686235ba01b5ec0e15ea80cb11e7fa8f22f37a1742bf0e818a3c6c14 WHIRLPOOL a4ec6692a72979756acd2381f428c6f3f0f6dd909a4270d529ad5348cbdd4bbe9f19d37ff24977a8683c5b48323edb251d946b138f3ce44793c1fe03884435be
30 +DIST samba-4.6.2.tar.gz 21097045 SHA256 927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35 SHA512 d64129b7fc65bf30cc06e34a07ac5cf04b52bf6639950eff48ae0ec27b0de44614df6a7c44b62b1859553fc7051f493b2d8216739da2232ac1caeaea81d328df WHIRLPOOL fed65abc7eb2b996062db57d40ccc57b10e8519412e97c9dd9147cd462f80f0b401939c2f00522595eed3f66f879c88039239d1dcf6fdc73c38c3fb7d43cef3a
31 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
32 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
33 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
34
35 diff --git a/net-fs/samba/samba-4.6.1.ebuild b/net-fs/samba/samba-4.5.8.ebuild
36 similarity index 83%
37 copy from net-fs/samba/samba-4.6.1.ebuild
38 copy to net-fs/samba/samba-4.5.8.ebuild
39 index aa112b04b0b..d76476baed2 100644
40 --- a/net-fs/samba/samba-4.6.1.ebuild
41 +++ b/net-fs/samba/samba-4.5.8.ebuild
42 @@ -14,7 +14,7 @@ SRC_PATH="stable"
43 [[ ${PV} = *_rc* ]] && SRC_PATH="rc"
44
45 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
46 - https://dev.gentoo.org/~polynomial-c/samba-4.6.0-disable-python-patches.tar.xz"
47 + https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz"
48 [[ ${PV} = *_rc* ]] || \
49 KEYWORDS="~amd64 ~hppa ~x86"
50
51 @@ -24,7 +24,7 @@ LICENSE="GPL-3"
52
53 SLOT="0"
54
55 -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python
56 +IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
57 quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
58
59 MULTILIB_WRAPPED_HEADERS=(
60 @@ -39,7 +39,7 @@ MULTILIB_WRAPPED_HEADERS=(
61 )
62
63 # sys-apps/attr is an automagic dependency (see bug #489748)
64 -CDEPEND="
65 +CDEPEND="${PYTHON_DEPS}
66 >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
67 dev-lang/perl:=
68 dev-libs/libaio[${MULTILIB_USEDEP}]
69 @@ -47,23 +47,19 @@ CDEPEND="
70 dev-libs/iniparser:0
71 dev-libs/popt[${MULTILIB_USEDEP}]
72 dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
73 - >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
74 sys-apps/attr[${MULTILIB_USEDEP}]
75 - >=sys-libs/ldb-1.1.29[ldap(+)?,python(+)?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
76 + >=sys-libs/ldb-1.1.27[ldap(+)?,${MULTILIB_USEDEP}]
77 sys-libs/libcap
78 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
79 sys-libs/readline:0=
80 - >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
81 - >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
82 - >=sys-libs/tevent-0.9.31-r1[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
83 + >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
84 + >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
85 + >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
86 sys-libs/zlib[${MULTILIB_USEDEP}]
87 virtual/libiconv
88 pam? ( virtual/pam )
89 acl? ( virtual/acl )
90 - addns? (
91 - net-dns/bind-tools[gssapi]
92 - dev-python/dnspython[${PYTHON_USEDEP}]
93 - )
94 + addns? ( net-dns/bind-tools[gssapi] )
95 cluster? ( !dev-db/ctdb )
96 cups? ( net-print/cups )
97 dmapi? ( sys-apps/dmapi )
98 @@ -76,39 +72,21 @@ CDEPEND="
99 ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
100 system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
101 system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
102 - systemd? ( sys-apps/systemd:0= )
103 - test? (
104 - !system-mitkrb5? (
105 - >=sys-libs/nss_wrapper-1.1.3
106 - >=net-dns/resolv_wrapper-1.1.4
107 - >=net-libs/socket_wrapper-1.1.7
108 - >=sys-libs/uid_wrapper-1.2.1
109 - )
110 - )"
111 + systemd? ( sys-apps/systemd:0= )"
112 DEPEND="${CDEPEND}
113 - ${PYTHON_DEPS}
114 virtual/pkgconfig"
115 RDEPEND="${CDEPEND}
116 - python? ( ${PYTHON_DEPS} )
117 client? ( net-fs/cifs-utils[ads?] )
118 selinux? ( sec-policy/selinux-samba )
119 !dev-perl/Parse-Yapp
120 "
121
122 -REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
123 - test? ( python )
124 - addns? ( python )
125 +REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
126 ads? ( acl gnutls ldap )
127 gpg? ( addc )
128 ?? ( system-heimdal system-mitkrb5 )
129 ${PYTHON_REQUIRED_USE}"
130
131 -# the test suite is messed, it uses system-installed samba
132 -# bits instead of what was built, tests things disabled via use
133 -# flags, and generally just fails to work in a way ebuilds could
134 -# rely on in its current state
135 -RESTRICT="test"
136 -
137 S="${WORKDIR}/${MY_P}"
138
139 PATCHES=(
140 @@ -138,12 +116,6 @@ src_prepare() {
141 # install the patches from tarball(s)
142 eapply "${WORKDIR}/patches"
143
144 - # un-bundle dnspython
145 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
146 -
147 - # unbundle iso8601 unless tests are enabled
148 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
149 -
150 # ugly hackaround for bug #592502
151 cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
152
153 @@ -198,7 +170,6 @@ multilib_src_configure() {
154 $(use_with systemd)
155 $(usex system-mitkrb5 '--with-system-mitkrb5' '')
156 $(use_with winbind)
157 - $(usex python '' '--disable-python')
158 $(usex test '--enable-selftest' '')
159 $(use_enable zeroconf avahi)
160 --with-shared-modules=${SHAREDMODS}
161 @@ -232,10 +203,6 @@ multilib_src_configure() {
162 waf-utils_src_configure ${myconf[@]}
163 }
164
165 -multilib_src_compile() {
166 - waf-utils_src_compile
167 -}
168 -
169 multilib_src_install() {
170 waf-utils_src_install
171
172
173 diff --git a/net-fs/samba/samba-4.6.1.ebuild b/net-fs/samba/samba-4.6.1.ebuild
174 index aa112b04b0b..30f4ff49fb5 100644
175 --- a/net-fs/samba/samba-4.6.1.ebuild
176 +++ b/net-fs/samba/samba-4.6.1.ebuild
177 @@ -62,7 +62,7 @@ CDEPEND="
178 acl? ( virtual/acl )
179 addns? (
180 net-dns/bind-tools[gssapi]
181 - dev-python/dnspython[${PYTHON_USEDEP}]
182 + dev-python/dnspython:=[${PYTHON_USEDEP}]
183 )
184 cluster? ( !dev-db/ctdb )
185 cups? ( net-print/cups )
186
187 diff --git a/net-fs/samba/samba-4.6.1.ebuild b/net-fs/samba/samba-4.6.2.ebuild
188 similarity index 99%
189 copy from net-fs/samba/samba-4.6.1.ebuild
190 copy to net-fs/samba/samba-4.6.2.ebuild
191 index aa112b04b0b..30f4ff49fb5 100644
192 --- a/net-fs/samba/samba-4.6.1.ebuild
193 +++ b/net-fs/samba/samba-4.6.2.ebuild
194 @@ -62,7 +62,7 @@ CDEPEND="
195 acl? ( virtual/acl )
196 addns? (
197 net-dns/bind-tools[gssapi]
198 - dev-python/dnspython[${PYTHON_USEDEP}]
199 + dev-python/dnspython:=[${PYTHON_USEDEP}]
200 )
201 cluster? ( !dev-db/ctdb )
202 cups? ( net-print/cups )
Report Message
Find on MARC Find on Google Groups