| 1 |
commit: e24041ef403ad622cc187eea98e42b0fa291cf11 |
| 2 |
Author: Fco Javier Felix <ffelix <AT> inode64 <DOT> com> |
| 3 |
AuthorDate: Sat Sep 24 06:30:58 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 02:46:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24041ef |
| 7 |
|
| 8 |
net-fs/samba: Make libunwind optional (fix automagic dep) |
| 9 |
|
| 10 |
It's only for debug and backtraces. |
| 11 |
|
| 12 |
Backport from samba-4.17, Look at the bugs in: |
| 13 |
https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f |
| 14 |
https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd |
| 15 |
|
| 16 |
See: https://github.com/gentoo/gentoo/pull/24280 |
| 17 |
Closes: https://bugs.gentoo.org/791349 |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/27422 |
| 19 |
Package-Manager: Portage-3.0.36, pkgcheck-0.10.14 |
| 20 |
Signed-off-by: Fco Javier Felix <web <AT> inode64.com> |
| 21 |
Signed-off-by: Fco Javier Felix <ffelix <AT> inode64.com> |
| 22 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 23 |
|
| 24 |
.../files/samba-4.15.9-libunwind-automagic.patch | 118 +++++++++++++++++++++ |
| 25 |
net-fs/samba/metadata.xml | 1 + |
| 26 |
...{samba-4.15.9.ebuild => samba-4.15.9-r1.ebuild} | 11 +- |
| 27 |
...mba-4.16.0-r1.ebuild => samba-4.16.0-r2.ebuild} | 11 +- |
| 28 |
...{samba-4.16.1.ebuild => samba-4.16.1-r1.ebuild} | 11 +- |
| 29 |
...{samba-4.16.2.ebuild => samba-4.16.2-r1.ebuild} | 11 +- |
| 30 |
...{samba-4.16.4.ebuild => samba-4.16.4-r1.ebuild} | 11 +- |
| 31 |
7 files changed, 159 insertions(+), 15 deletions(-) |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 000000000000..c3a2c802e6e9 |
| 36 |
--- /dev/null |
| 37 |
+++ b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch |
| 38 |
@@ -0,0 +1,118 @@ |
| 39 |
+https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd |
| 40 |
+https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f |
| 41 |
+https://bugs.gentoo.org/791349 |
| 42 |
+ |
| 43 |
+From 14feb93d481011765f62614ab49b304e17e4f6fd Mon Sep 17 00:00:00 2001 |
| 44 |
+From: Andrew Bartlett <abartlet@×××××.org> |
| 45 |
+Date: Tue, 7 Jun 2022 15:07:59 +1200 |
| 46 |
+Subject: [PATCH] lib/util: Prefer backtrace_symbols() for internal backtraces |
| 47 |
+ |
| 48 |
+Backtraces when Samba is in PANIC state are better with |
| 49 |
+backtrace_symbols() than with libunwind on Ubuntu 20.04 x86_64 |
| 50 |
+so move libunwind to a off-by-default option, prompted for |
| 51 |
+if backtrace_symbols() is not available. |
| 52 |
+ |
| 53 |
+Based on a request by Fco Javier Felix <ffelix@×××××××.com> |
| 54 |
+ |
| 55 |
+Signed-off-by: Andrew Bartlett <abartlet@×××××.org> |
| 56 |
+Reviewed-by: Joseph Sutton <josephsutton@××××××××××××.nz> |
| 57 |
+--- a/lib/util/fault.c |
| 58 |
++++ b/lib/util/fault.c |
| 59 |
+@@ -222,9 +222,13 @@ _PUBLIC_ void smb_panic(const char *why) |
| 60 |
+ void log_stack_trace(void) |
| 61 |
+ { |
| 62 |
+ #ifdef HAVE_LIBUNWIND |
| 63 |
+- /* Try to use libunwind before any other technique since on ia64 |
| 64 |
+- * libunwind correctly walks the stack in more circumstances than |
| 65 |
+- * backtrace. |
| 66 |
++ /* |
| 67 |
++ * --with-libunwind is required to use libunwind, the |
| 68 |
++ * backtrace_symbols() code below is the default. |
| 69 |
++ * |
| 70 |
++ * This code is available because a previous version of this |
| 71 |
++ * comment asserted that on ia64 libunwind correctly walks the |
| 72 |
++ * stack in more circumstances than backtrace. |
| 73 |
+ */ |
| 74 |
+ unw_cursor_t cursor; |
| 75 |
+ unw_context_t uc; |
| 76 |
+--- a/lib/util/wscript |
| 77 |
++++ b/lib/util/wscript |
| 78 |
+@@ -2,6 +2,15 @@ def options(opt): |
| 79 |
+ ''' This is a bit strange, but disable is the flag, not enable. ''' |
| 80 |
+ opt.add_option('--disable-fault-handling', action='store_true', dest='disable_fault_handling', help=('disable the fault handlers'), default=False) |
| 81 |
+ |
| 82 |
++ # We do not want libunwind by default (backtrace_symbols() in |
| 83 |
++ # glibc is better) but allow (eg) IA-64 to build with it where it |
| 84 |
++ # might be better (per old comment in fault.c) |
| 85 |
++ opt.samba_add_onoff_option('libunwind', |
| 86 |
++ default=None, |
| 87 |
++ help='''Use libunwind instead of the default backtrace_symbols() |
| 88 |
++ from libc, for example on IA-64 where it might give a better |
| 89 |
++ backtrace.''') |
| 90 |
++ |
| 91 |
+ opt.add_option('--with-systemd', |
| 92 |
+ help=("Enable systemd integration"), |
| 93 |
+ action='store_true', dest='enable_systemd') |
| 94 |
+--- a/lib/util/wscript_configure |
| 95 |
++++ b/lib/util/wscript_configure |
| 96 |
+@@ -1,23 +1,35 @@ |
| 97 |
+ #!/usr/bin/env python |
| 98 |
+-from waflib import Logs, Options |
| 99 |
++from waflib import Logs, Options, Errors |
| 100 |
+ |
| 101 |
+ import os, sys |
| 102 |
+ |
| 103 |
+ if Options.options.disable_fault_handling: |
| 104 |
+ conf.DEFINE('HAVE_DISABLE_FAULT_HANDLING',1) |
| 105 |
+ |
| 106 |
+-# backtrace could be in libexecinfo or in libc |
| 107 |
++# backtrace could be in libexecinfo or in libc. |
| 108 |
++# This is our preferred backtrace handler (more useful output than libunwind as at Ubuntu 20.04 x86_64) |
| 109 |
+ conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h') |
| 110 |
+ conf.CHECK_HEADERS('execinfo.h') |
| 111 |
+ |
| 112 |
+ conf.SET_TARGET_TYPE('LIBUNWIND', 'EMPTY') |
| 113 |
+-if conf.check_cfg(package='libunwind-generic', |
| 114 |
+- args='--cflags --libs', |
| 115 |
+- msg='Checking for libunwind', |
| 116 |
+- uselib_store='LIBUNWIND', |
| 117 |
+- mandatory=False): |
| 118 |
+- if conf.CHECK_HEADERS('libunwind.h'): |
| 119 |
+- conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') |
| 120 |
++if Options.options.with_libunwind: |
| 121 |
++ if conf.check_cfg(package='libunwind-generic', |
| 122 |
++ args='--cflags --libs', |
| 123 |
++ msg='Checking for libunwind', |
| 124 |
++ uselib_store='LIBUNWIND', |
| 125 |
++ mandatory=False): |
| 126 |
++ if conf.CHECK_HEADERS('libunwind.h'): |
| 127 |
++ conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') |
| 128 |
++ else: |
| 129 |
++ raise Errors.WafError('--with-libunwind specified but libunwind not found') |
| 130 |
++elif Options.options.with_libunwind == None: |
| 131 |
++ if not conf.CONFIG_SET('HAVE_BACKTRACE_SYMBOLS') \ |
| 132 |
++ and not Options.options.disable_fault_handling: |
| 133 |
++ raise Errors.WafError( |
| 134 |
++'''backtrace_symbols() not found but |
| 135 |
++--with-libunwind not specified. |
| 136 |
++Use --without-libunwind to build without internal backtrace support or |
| 137 |
++--disable-fault-handling to totally defer fault handling to the OS.''') |
| 138 |
+ |
| 139 |
+ conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h') |
| 140 |
+ |
| 141 |
+--- a/script/autobuild.py |
| 142 |
++++ b/script/autobuild.py |
| 143 |
+@@ -480,10 +480,11 @@ tasks = { |
| 144 |
+ # MIT Kerberos from the current system. Runtime behaviour is |
| 145 |
+ # confirmed via the ktest (static ccache and keytab) environment |
| 146 |
+ |
| 147 |
++ # This environment also used to confirm we can still build with --with-libunwind |
| 148 |
+ "samba-ktest-mit": { |
| 149 |
+ "sequence": [ |
| 150 |
+ ("random-sleep", random_sleep(300, 900)), |
| 151 |
+- ("configure", "./configure.developer --without-ad-dc --with-system-mitkrb5 " + samba_configure_params), |
| 152 |
++ ("configure", "./configure.developer --without-ad-dc --with-libunwind --with-system-mitkrb5 " + samba_configure_params), |
| 153 |
+ ("make", "make -j"), |
| 154 |
+ ("test", make_test(include_envs=[ |
| 155 |
+ "ktest", # ktest is also tested in fileserver, samba and |
| 156 |
+GitLab |
| 157 |
|
| 158 |
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml |
| 159 |
index 0430625e206a..eedfdee5aad4 100644 |
| 160 |
--- a/net-fs/samba/metadata.xml |
| 161 |
+++ b/net-fs/samba/metadata.xml |
| 162 |
@@ -29,6 +29,7 @@ |
| 163 |
bundled heimdal.</flag> |
| 164 |
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of |
| 165 |
<pkg>app-crypt/heimdal</pkg>.</flag> |
| 166 |
+ <flag name="unwind">Enable libunwind usage for backtraces</flag> |
| 167 |
<flag name="winbind">Enables support for the winbind auth daemon</flag> |
| 168 |
</use> |
| 169 |
<upstream> |
| 170 |
|
| 171 |
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9-r1.ebuild |
| 172 |
similarity index 96% |
| 173 |
rename from net-fs/samba/samba-4.15.9.ebuild |
| 174 |
rename to net-fs/samba/samba-4.15.9-r1.ebuild |
| 175 |
index 3ea8aa274e59..6042a3515c40 100644 |
| 176 |
--- a/net-fs/samba/samba-4.15.9.ebuild |
| 177 |
+++ b/net-fs/samba/samba-4.15.9-r1.ebuild |
| 178 |
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" |
| 179 |
LICENSE="GPL-3" |
| 180 |
SLOT="0" |
| 181 |
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 182 |
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux |
| 183 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
| 184 |
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 185 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 186 |
zeroconf" |
| 187 |
|
| 188 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 189 |
@@ -87,7 +87,6 @@ COMMON_DEPEND=" |
| 190 |
net-dns/bind-tools[gssapi] |
| 191 |
) |
| 192 |
") |
| 193 |
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) |
| 194 |
acl? ( virtual/acl ) |
| 195 |
ceph? ( sys-cluster/ceph ) |
| 196 |
cluster? ( net-libs/rpcsvc-proto ) |
| 197 |
@@ -108,6 +107,10 @@ COMMON_DEPEND=" |
| 198 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
| 199 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) |
| 200 |
systemd? ( sys-apps/systemd:0= ) |
| 201 |
+ unwind? ( |
| 202 |
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= ) |
| 203 |
+ !llvm-libunwind? ( sys-libs/libunwind:= ) |
| 204 |
+ ) |
| 205 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 206 |
" |
| 207 |
DEPEND="${COMMON_DEPEND} |
| 208 |
@@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS} |
| 209 |
PATCHES=( |
| 210 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
| 211 |
"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" |
| 212 |
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" |
| 213 |
) |
| 214 |
|
| 215 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 216 |
@@ -229,6 +233,7 @@ multilib_src_configure() { |
| 217 |
$(multilib_native_use_with systemd) |
| 218 |
--systemd-install-services |
| 219 |
--with-systemddir="$(systemd_get_systemunitdir)" |
| 220 |
+ $(multilib_native_use_with unwind libunwind) |
| 221 |
$(multilib_native_use_with winbind) |
| 222 |
$(multilib_native_usex python '' '--disable-python') |
| 223 |
$(multilib_native_use_enable zeroconf avahi) |
| 224 |
|
| 225 |
diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild b/net-fs/samba/samba-4.16.0-r2.ebuild |
| 226 |
similarity index 96% |
| 227 |
rename from net-fs/samba/samba-4.16.0-r1.ebuild |
| 228 |
rename to net-fs/samba/samba-4.16.0-r2.ebuild |
| 229 |
index a7d3fa8bb5d3..5e93ab77f6a8 100644 |
| 230 |
--- a/net-fs/samba/samba-4.16.0-r1.ebuild |
| 231 |
+++ b/net-fs/samba/samba-4.16.0-r2.ebuild |
| 232 |
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" |
| 233 |
LICENSE="GPL-3" |
| 234 |
SLOT="0" |
| 235 |
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 236 |
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux |
| 237 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
| 238 |
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 239 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 240 |
zeroconf" |
| 241 |
|
| 242 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 243 |
@@ -87,7 +87,6 @@ COMMON_DEPEND=" |
| 244 |
net-dns/bind-tools[gssapi] |
| 245 |
) |
| 246 |
") |
| 247 |
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) |
| 248 |
acl? ( virtual/acl ) |
| 249 |
ceph? ( sys-cluster/ceph ) |
| 250 |
cluster? ( net-libs/rpcsvc-proto ) |
| 251 |
@@ -108,6 +107,10 @@ COMMON_DEPEND=" |
| 252 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
| 253 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) |
| 254 |
systemd? ( sys-apps/systemd:0= ) |
| 255 |
+ unwind? ( |
| 256 |
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= ) |
| 257 |
+ !llvm-libunwind? ( sys-libs/libunwind:= ) |
| 258 |
+ ) |
| 259 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 260 |
" |
| 261 |
DEPEND="${COMMON_DEPEND} |
| 262 |
@@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS} |
| 263 |
|
| 264 |
PATCHES=( |
| 265 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
| 266 |
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" |
| 267 |
) |
| 268 |
|
| 269 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 270 |
@@ -229,6 +233,7 @@ multilib_src_configure() { |
| 271 |
$(multilib_native_use_with systemd) |
| 272 |
--systemd-install-services |
| 273 |
--with-systemddir="$(systemd_get_systemunitdir)" |
| 274 |
+ $(multilib_native_use_with unwind libunwind) |
| 275 |
$(multilib_native_use_with winbind) |
| 276 |
$(multilib_native_usex python '' '--disable-python') |
| 277 |
$(multilib_native_use_enable zeroconf avahi) |
| 278 |
|
| 279 |
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1-r1.ebuild |
| 280 |
similarity index 96% |
| 281 |
rename from net-fs/samba/samba-4.16.1.ebuild |
| 282 |
rename to net-fs/samba/samba-4.16.1-r1.ebuild |
| 283 |
index 8b16a80d66cb..0c212106d9e4 100644 |
| 284 |
--- a/net-fs/samba/samba-4.16.1.ebuild |
| 285 |
+++ b/net-fs/samba/samba-4.16.1-r1.ebuild |
| 286 |
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" |
| 287 |
LICENSE="GPL-3" |
| 288 |
SLOT="0" |
| 289 |
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 290 |
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux |
| 291 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
| 292 |
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 293 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 294 |
zeroconf" |
| 295 |
|
| 296 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 297 |
@@ -87,7 +87,6 @@ COMMON_DEPEND=" |
| 298 |
net-dns/bind-tools[gssapi] |
| 299 |
) |
| 300 |
") |
| 301 |
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) |
| 302 |
acl? ( virtual/acl ) |
| 303 |
ceph? ( sys-cluster/ceph ) |
| 304 |
cluster? ( net-libs/rpcsvc-proto ) |
| 305 |
@@ -108,6 +107,10 @@ COMMON_DEPEND=" |
| 306 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
| 307 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) |
| 308 |
systemd? ( sys-apps/systemd:0= ) |
| 309 |
+ unwind? ( |
| 310 |
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= ) |
| 311 |
+ !llvm-libunwind? ( sys-libs/libunwind:= ) |
| 312 |
+ ) |
| 313 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 314 |
" |
| 315 |
DEPEND="${COMMON_DEPEND} |
| 316 |
@@ -142,6 +145,7 @@ BDEPEND="${PYTHON_DEPS} |
| 317 |
PATCHES=( |
| 318 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
| 319 |
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" |
| 320 |
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" |
| 321 |
) |
| 322 |
|
| 323 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 324 |
@@ -230,6 +234,7 @@ multilib_src_configure() { |
| 325 |
$(multilib_native_use_with systemd) |
| 326 |
--systemd-install-services |
| 327 |
--with-systemddir="$(systemd_get_systemunitdir)" |
| 328 |
+ $(multilib_native_use_with unwind libunwind) |
| 329 |
$(multilib_native_use_with winbind) |
| 330 |
$(multilib_native_usex python '' '--disable-python') |
| 331 |
$(multilib_native_use_enable zeroconf avahi) |
| 332 |
|
| 333 |
diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2-r1.ebuild |
| 334 |
similarity index 96% |
| 335 |
rename from net-fs/samba/samba-4.16.2.ebuild |
| 336 |
rename to net-fs/samba/samba-4.16.2-r1.ebuild |
| 337 |
index e5115c4e9c41..994f304e789e 100644 |
| 338 |
--- a/net-fs/samba/samba-4.16.2.ebuild |
| 339 |
+++ b/net-fs/samba/samba-4.16.2-r1.ebuild |
| 340 |
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" |
| 341 |
LICENSE="GPL-3" |
| 342 |
SLOT="0" |
| 343 |
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 344 |
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux |
| 345 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
| 346 |
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 347 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 348 |
zeroconf" |
| 349 |
|
| 350 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 351 |
@@ -87,7 +87,6 @@ COMMON_DEPEND=" |
| 352 |
net-dns/bind-tools[gssapi] |
| 353 |
) |
| 354 |
") |
| 355 |
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) |
| 356 |
acl? ( virtual/acl ) |
| 357 |
ceph? ( sys-cluster/ceph ) |
| 358 |
cluster? ( net-libs/rpcsvc-proto ) |
| 359 |
@@ -108,6 +107,10 @@ COMMON_DEPEND=" |
| 360 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
| 361 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) |
| 362 |
systemd? ( sys-apps/systemd:0= ) |
| 363 |
+ unwind? ( |
| 364 |
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= ) |
| 365 |
+ !llvm-libunwind? ( sys-libs/libunwind:= ) |
| 366 |
+ ) |
| 367 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 368 |
" |
| 369 |
DEPEND="${COMMON_DEPEND} |
| 370 |
@@ -143,6 +146,7 @@ PATCHES=( |
| 371 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
| 372 |
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" |
| 373 |
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" |
| 374 |
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" |
| 375 |
) |
| 376 |
|
| 377 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 378 |
@@ -232,6 +236,7 @@ multilib_src_configure() { |
| 379 |
$(multilib_native_use_with systemd) |
| 380 |
--systemd-install-services |
| 381 |
--with-systemddir="$(systemd_get_systemunitdir)" |
| 382 |
+ $(multilib_native_use_with unwind libunwind) |
| 383 |
$(multilib_native_use_with winbind) |
| 384 |
$(multilib_native_usex python '' '--disable-python') |
| 385 |
$(multilib_native_use_enable zeroconf avahi) |
| 386 |
|
| 387 |
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4-r1.ebuild |
| 388 |
similarity index 96% |
| 389 |
rename from net-fs/samba/samba-4.16.4.ebuild |
| 390 |
rename to net-fs/samba/samba-4.16.4-r1.ebuild |
| 391 |
index ae46c2cab18c..6dc422deafb4 100644 |
| 392 |
--- a/net-fs/samba/samba-4.16.4.ebuild |
| 393 |
+++ b/net-fs/samba/samba-4.16.4-r1.ebuild |
| 394 |
@@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" |
| 395 |
LICENSE="GPL-3" |
| 396 |
SLOT="0" |
| 397 |
IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 398 |
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux |
| 399 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
| 400 |
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 401 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 402 |
zeroconf" |
| 403 |
|
| 404 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 405 |
@@ -87,7 +87,6 @@ COMMON_DEPEND=" |
| 406 |
net-dns/bind-tools[gssapi] |
| 407 |
) |
| 408 |
") |
| 409 |
- !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) |
| 410 |
acl? ( virtual/acl ) |
| 411 |
ceph? ( sys-cluster/ceph ) |
| 412 |
cluster? ( net-libs/rpcsvc-proto ) |
| 413 |
@@ -108,6 +107,10 @@ COMMON_DEPEND=" |
| 414 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
| 415 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) |
| 416 |
systemd? ( sys-apps/systemd:0= ) |
| 417 |
+ unwind? ( |
| 418 |
+ llvm-libunwind? ( sys-libs/llvm-libunwind:= ) |
| 419 |
+ !llvm-libunwind? ( sys-libs/libunwind:= ) |
| 420 |
+ ) |
| 421 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 422 |
" |
| 423 |
DEPEND="${COMMON_DEPEND} |
| 424 |
@@ -145,6 +148,7 @@ PATCHES=( |
| 425 |
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" |
| 426 |
"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" |
| 427 |
"${FILESDIR}/${P}-glibc-2.36.patch" |
| 428 |
+ "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" |
| 429 |
) |
| 430 |
|
| 431 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 432 |
@@ -234,6 +238,7 @@ multilib_src_configure() { |
| 433 |
$(multilib_native_use_with systemd) |
| 434 |
--systemd-install-services |
| 435 |
--with-systemddir="$(systemd_get_systemunitdir)" |
| 436 |
+ $(multilib_native_use_with unwind libunwind) |
| 437 |
$(multilib_native_use_with winbind) |
| 438 |
$(multilib_native_usex python '' '--disable-python') |
| 439 |
$(multilib_native_use_enable zeroconf avahi) |
Archives