| 1 |
commit: 4c97fbb80dc7249d49cdeedf24c2198fc2ae09d6 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Sun Feb 4 20:41:52 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 7 12:19:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4c97fbb8 |
| 7 |
|
| 8 |
net-fs/samba: revbump |
| 9 |
|
| 10 |
net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 +++++++++++ |
| 11 |
...{samba-4.5.10-r1.ebuild => samba-4.5.15.ebuild} | 29 ++++++++++++++-------- |
| 12 |
2 files changed, 33 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..e664468 |
| 17 |
--- /dev/null |
| 18 |
+++ b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch |
| 19 |
@@ -0,0 +1,14 @@ |
| 20 |
+https://attachments.samba.org/attachment.cgi?id=13172 |
| 21 |
+https://bugs.gentoo.org/637320 |
| 22 |
+ |
| 23 |
+--- a/lib/replace/wscript |
| 24 |
++++ b/lib/replace/wscript |
| 25 |
+@@ -71,7 +71,7 @@ |
| 26 |
+ conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') |
| 27 |
+ conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') |
| 28 |
+ |
| 29 |
+- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') |
| 30 |
++ conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') |
| 31 |
+ |
| 32 |
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') |
| 33 |
+ conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
| 34 |
|
| 35 |
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild b/net-fs/samba/samba-4.5.15.ebuild |
| 36 |
similarity index 90% |
| 37 |
rename from net-fs/samba/samba-4.5.10-r1.ebuild |
| 38 |
rename to net-fs/samba/samba-4.5.15.ebuild |
| 39 |
index e897e4a..4bc41b2 100644 |
| 40 |
--- a/net-fs/samba/samba-4.5.10-r1.ebuild |
| 41 |
+++ b/net-fs/samba/samba-4.5.15.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2017 Gentoo Foundation |
| 44 |
+# Copyright 1999-2018 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=6 |
| 48 |
@@ -14,9 +14,9 @@ SRC_PATH="stable" |
| 49 |
[[ ${PV} = *_rc* ]] && SRC_PATH="rc" |
| 50 |
|
| 51 |
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz |
| 52 |
- https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz" |
| 53 |
+ https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz" |
| 54 |
[[ ${PV} = *_rc* ]] || \ |
| 55 |
-KEYWORDS="amd64 ~arm ia64 ppc sparc x86" |
| 56 |
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
| 57 |
|
| 58 |
DESCRIPTION="Samba Suite Version 4" |
| 59 |
HOMEPAGE="http://www.samba.org/" |
| 60 |
@@ -27,6 +27,12 @@ SLOT="0" |
| 61 |
IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam |
| 62 |
quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
| 63 |
|
| 64 |
+# the test suite is messed, it uses system-installed samba |
| 65 |
+# bits instead of what was built, tests things disabled via use |
| 66 |
+# flags, and generally just fails to work in a way ebuilds could |
| 67 |
+# rely on in its current state |
| 68 |
+RESTRICT="test" |
| 69 |
+ |
| 70 |
MULTILIB_WRAPPED_HEADERS=( |
| 71 |
/usr/include/samba-4.0/policy.h |
| 72 |
/usr/include/samba-4.0/dcerpc_server.h |
| 73 |
@@ -49,6 +55,7 @@ CDEPEND="${PYTHON_DEPS} |
| 74 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 75 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 76 |
>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
| 77 |
+ <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
| 78 |
sys-libs/libcap |
| 79 |
sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
| 80 |
sys-libs/readline:0= |
| 81 |
@@ -74,14 +81,14 @@ CDEPEND="${PYTHON_DEPS} |
| 82 |
system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) |
| 83 |
systemd? ( sys-apps/systemd:0= )" |
| 84 |
DEPEND="${CDEPEND} |
| 85 |
+ app-text/docbook-xsl-stylesheets |
| 86 |
+ dev-libs/libxslt |
| 87 |
virtual/pkgconfig |
| 88 |
test? ( |
| 89 |
- !system-mitkrb5? ( |
| 90 |
- >=sys-libs/nss_wrapper-1.1.3 |
| 91 |
- >=net-dns/resolv_wrapper-1.1.4 |
| 92 |
- >=net-libs/socket_wrapper-1.1.7 |
| 93 |
- >=sys-libs/uid_wrapper-1.2.1 |
| 94 |
- ) |
| 95 |
+ >=sys-libs/nss_wrapper-1.1.3 |
| 96 |
+ >=net-dns/resolv_wrapper-1.1.4 |
| 97 |
+ >=net-libs/socket_wrapper-1.1.7 |
| 98 |
+ >=sys-libs/uid_wrapper-1.2.1 |
| 99 |
)" |
| 100 |
RDEPEND="${CDEPEND} |
| 101 |
client? ( net-fs/cifs-utils[ads?] ) |
| 102 |
@@ -100,6 +107,7 @@ S="${WORKDIR}/${MY_P}" |
| 103 |
PATCHES=( |
| 104 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
| 105 |
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" |
| 106 |
+ "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 |
| 107 |
"${FILESDIR}/${PN}-4.3.9-remove-getpwent_r.patch" |
| 108 |
"${FILESDIR}/netdb-defines.patch" |
| 109 |
) |
| 110 |
@@ -159,6 +167,7 @@ multilib_src_configure() { |
| 111 |
--disable-rpath-install |
| 112 |
--nopyc |
| 113 |
--nopyo |
| 114 |
+ --disable-cephfs |
| 115 |
) |
| 116 |
if multilib_is_native_abi ; then |
| 117 |
myconf+=( |
| 118 |
@@ -233,7 +242,7 @@ multilib_src_install() { |
| 119 |
|
| 120 |
# create symlink for cups (bug #552310) |
| 121 |
if use cups ; then |
| 122 |
- dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb |
| 123 |
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb |
| 124 |
fi |
| 125 |
|
| 126 |
# install example config file |
Archives