* [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2018-02-07 12:19 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2018-02-07 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 4c97fbb80dc7249d49cdeedf24c2198fc2ae09d6
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Feb 4 20:41:52 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 12:19:22 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4c97fbb8
net-fs/samba: revbump
net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 +++++++++++
...{samba-4.5.10-r1.ebuild => samba-4.5.15.ebuild} | 29 ++++++++++++++--------
2 files changed, 33 insertions(+), 10 deletions(-)
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 0000000..e664468
--- /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.5.10-r1.ebuild b/net-fs/samba/samba-4.5.15.ebuild
similarity index 90%
rename from net-fs/samba/samba-4.5.10-r1.ebuild
rename to net-fs/samba/samba-4.5.15.ebuild
index e897e4a..4bc41b2 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,9 +14,9 @@ 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-4.5.11-disable-python-patches.tar.xz"
[[ ${PV} = *_rc* ]] || \
-KEYWORDS="amd64 ~arm ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
DESCRIPTION="Samba Suite Version 4"
HOMEPAGE="http://www.samba.org/"
@@ -27,6 +27,12 @@ SLOT="0"
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"
+# 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
@@ -49,6 +55,7 @@ CDEPEND="${PYTHON_DEPS}
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
+ <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
sys-libs/readline:0=
@@ -74,14 +81,14 @@ CDEPEND="${PYTHON_DEPS}
system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:0= )"
DEPEND="${CDEPEND}
+ 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
- )
+ >=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}
client? ( net-fs/cifs-utils[ads?] )
@@ -100,6 +107,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
"${FILESDIR}/${PN}-4.3.9-remove-getpwent_r.patch"
"${FILESDIR}/netdb-defines.patch"
)
@@ -159,6 +167,7 @@ multilib_src_configure() {
--disable-rpath-install
--nopyc
--nopyo
+ --disable-cephfs
)
if multilib_is_native_abi ; then
myconf+=(
@@ -233,7 +242,7 @@ multilib_src_install() {
# create symlink for cups (bug #552310)
if use cups ; then
- dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
fi
# install example config file
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2022-07-19 17:35 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2022-07-19 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 12687968650c38f13b313c63bfb9ce552e8c5522
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 17:34:56 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:34:56 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=12687968
net-fs/samba: add missing signal.h
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-fs/samba/files/add-missing_signal_h.patch | 11 ++++++
.../samba/files/fix-musl-lib-without-innetgr.patch | 42 ----------------------
net-fs/samba/samba-4.15.7.ebuild | 2 +-
3 files changed, 12 insertions(+), 43 deletions(-)
diff --git a/net-fs/samba/files/add-missing_signal_h.patch b/net-fs/samba/files/add-missing_signal_h.patch
new file mode 100644
index 00000000..b6ea71c7
--- /dev/null
+++ b/net-fs/samba/files/add-missing_signal_h.patch
@@ -0,0 +1,11 @@
+diff -Naur samba-4.15.7.orig/source3/printing/samba-bgqd.c samba-4.15.7/source3/printing/samba-bgqd.c
+--- samba-4.15.7.orig/source3/printing/samba-bgqd.c 2022-03-15 09:19:34.136201100 -0400
++++ samba-4.15.7/source3/printing/samba-bgqd.c 2022-07-19 13:27:56.069779404 -0400
+@@ -15,6 +15,7 @@
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <signal.h>
+ #include "replace.h"
+ #include "system/filesys.h"
+ #include "lib/util/server_id.h"
diff --git a/net-fs/samba/files/fix-musl-lib-without-innetgr.patch b/net-fs/samba/files/fix-musl-lib-without-innetgr.patch
deleted file mode 100644
index fb12a10e..00000000
--- a/net-fs/samba/files/fix-musl-lib-without-innetgr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fcb8ecd530b2d151e373974741601483326f7528 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 27 Jun 2019 11:09:47 +0800
-Subject: [PATCH] samba: fix musl lib without innetgr
-
-Upstream-Status: Pending
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- lib/util/access.c | 2 +-
- source3/auth/user_util.c | 2 +-
- 2 file changed, 2 insertion(+), 2 deletion(-)
-
-diff --git a/lib/util/access.c b/lib/util/access.c
-index 7da0573..b94949e 100644
---- a/lib/util/access.c
-+++ b/lib/util/access.c
-@@ -112,7 +112,7 @@ static bool string_match(const char *tok,const char *s)
- return true;
- }
- } else if (tok[0] == '@') { /* netgroup: look it up */
--#ifdef HAVE_NETGROUP
-+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR)
- DATA_BLOB tmp;
- char *mydomain = NULL;
- char *hostname = NULL;
-diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
-index a76b5d4..30f523d 100644
---- a/source3/auth/user_util.c
-+++ b/source3/auth/user_util.c
-@@ -148,7 +148,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char
-
- bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname)
- {
--#ifdef HAVE_NETGROUP
-+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR)
- static char *my_yp_domain = NULL;
- char *lowercase_user = NULL;
-
---
-2.7.4
-
diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild
index 46fa6428..9ecb3bbf 100644
--- a/net-fs/samba/samba-4.15.7.ebuild
+++ b/net-fs/samba/samba-4.15.7.ebuild
@@ -183,7 +183,7 @@ src_prepare() {
if use elibc_musl ; then
eapply "${FILESDIR}"/add_missing___compar_fn_t.patch
- eapply "${FILESDIR}"/fix-musl-lib-without-innetgr.patch
+ eapply "${FILESDIR}"/add-missing_signal_h.patch
eapply "${FILESDIR}"/getpwent_r.patch
eapply "${FILESDIR}"/missing-headers.patch
eapply "${FILESDIR}"/musl_rm_unistd_incl.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2020-06-22 16:49 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2020-06-22 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 8e1dac64ed1ec283415018317cac8a3721e211b5
Author: Louis Leseur <louis.leseur <AT> gmail <DOT> com>
AuthorDate: Sun Jun 21 05:26:00 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 16:48:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e1dac64
net-fs/samba: bump to version 4.11.8
Sync with ::gentoo.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Manifest-Sign-Key: 0x3E2EEE90CCB2DF78
Signed-off-by: Louis Leseur <louis.leseur <AT> gmail.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-fs/samba/Manifest | 22 ++
.../files/samba-4.11.8-musl-fix-compar_fn_t.patch | 16 ++
net-fs/samba/samba-4.11.8.ebuild | 319 +++++++++++++++++++++
3 files changed, 357 insertions(+)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c9827f9..876f207 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
+DIST samba-4.11.8.tar.gz 18571308 BLAKE2B 024920789ac8fcedfc79f4d094a47e4c1399a0bbc3ad79908f66b9bbabd765865795763c1017cc0caba18dbc11ce6a7e25231804d7dff11ab3d97a599ab8d9ed SHA512 a036c46e060d9edc11bf4e45e0449042fe44b74ff083d305779c68dad943f87fb6d2680f3a68e6bbcd0b19c8c397ec9fc5794229a311c25dad9efc366add613a
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAEBCAB9FiEEOA+uIz0+s3MTYJHqpFO6gRhEr2EFAl7u72hfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDM4
+MEZBRTIzM0QzRUIzNzMxMzYwOTFFQUE0NTNCQTgxMTg0NEFGNjEACgkQpFO6gRhE
+r2FPzw//cIo8r9QWWD4xVicZUU/FoXw63ZaIPfYwBJKP+RL9XKHFE0rv7CVZXJLx
+xH2hv4rfoMo11qzUrd3IYSh6xCV1568ikEDbWfwRqNEHlEBbmJ6xPuL9oCpl0TJM
+RSwRQut/fCeRyYH+odnO3v3eKmGVEUayz3ijwHtmwSK6oOs2xdp1hp2hb754eA13
+UgEiC9kp1pYiUpyMuLQYxsGbSV63znb4HgrJG6Dr9MjfpGks6kUeETkmM6qjU4aD
+Bqfeig2L3f6Flz1jnGBEkH/KcXMc6+2V8O9um+QMztR+UE/XlM8Saqg6WKGL71vA
+xhrZY/E3OCe9wpzn7ndJhFiFzZAZz9giBA0NAvFUjZEW0IkBVTq5rL2Y5JDq9zL3
+IonRVy6jVAnHgAChvV7pohIb19x/1BIty+G9ecmMNb6k9vAOr1BRe/pqwLpxkw3P
+EcaiihIPoFvgjqZj1B3x9vkLxJ0+xp62WIG2Tc+M6owHr58cg84C8FlCvIdyldsK
+9xSRvOuH/f4Uf2/fG39dsOtBJciDWXCkkupDADGS3yYBH3WkBLvtsqC5cNdd5wqR
+HGH0JKTutI8GpbfXcEKOAQn++CI3VZ3UEccDONb/HrY/TPNCMsxShF/sJG51SioB
+yvbW6kpIfstTq6Gbsf7EigVDN/SJrB4PlB+QsxCOleb2ConHkTs=
+=h02N
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/samba-4.11.8-musl-fix-compar_fn_t.patch b/net-fs/samba/files/samba-4.11.8-musl-fix-compar_fn_t.patch
new file mode 100644
index 0000000..223bc64
--- /dev/null
+++ b/net-fs/samba/files/samba-4.11.8-musl-fix-compar_fn_t.patch
@@ -0,0 +1,16 @@
+diff --git a/source4/dsdb/samdb/ldb_modules/count_attrs.c b/source4/dsdb/samdb/ldb_modules/count_attrs.c
+index b0d1b22..2d53b53 100644
+--- a/source4/dsdb/samdb/ldb_modules/count_attrs.c
++++ b/source4/dsdb/samdb/ldb_modules/count_attrs.c
+@@ -38,6 +38,11 @@
+ #define NULL_REQ_PSEUDO_N -2LL;
+ #define STAR_REQ_PSEUDO_N -4LL;
+
++#ifndef __COMPAR_FN_T
++#define __COMPAR_FN_T
++typedef int (*__compar_fn_t)(const void *, const void *);
++#endif
++
+ struct count_attrs_private {
+ struct tdb_wrap *requested;
+ struct tdb_wrap *duplicates;
diff --git a/net-fs/samba/samba-4.11.8.ebuild b/net-fs/samba/samba-4.11.8.ebuild
new file mode 100644
index 0000000..4bfa167
--- /dev/null
+++ b/net-fs/samba/samba-4.11.8.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 gpg iprint
+json ldap pam profiling-data 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
+)
+
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/libtasn1[${MULTILIB_USEDEP}]
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-3.2.0[${MULTILIB_USEDEP}]
+ net-libs/libnsl:=[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-2.0.10[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+ <sys-libs/ldb-2.1.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.10.0[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}] )
+ 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 )
+"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ 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 json winbind )
+ addns? ( python )
+ ads? ( acl 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.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
+ if use elibc_musl; then
+ eapply "${FILESDIR}/musl-disable-netgroup.patch"
+ eapply "${FILESDIR}/netdb-defines.patch"
+ eapply "${FILESDIR}/${PN}-4.11.8-musl-fix-compar_fn_t.patch"
+ fi
+
+ # 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)
+ --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
+
+ systemd_dotmpfilesd "${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/log/samba
+}
+
+multilib_src_install_all() {
+ # Attempt to fix bug #673168
+ find "${ED}" -type d -name "Yapp" -print0 \
+ | xargs -0 --no-run-if-empty rm -r || die
+}
+
+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] 5+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2016-05-29 16:46 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2016-05-29 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 60b3cbdc727bb17462427d669c0d4f877cafc767
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 16:48:33 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 29 16:48:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=60b3cbdc
net-fs/samba: use alpine patch for getpwent_r() and getgrent_r()
net-fs/samba/Manifest | 6 +-
.../files/samba-4.3.9-remove-getpwent_r.patch | 161 +++++++++------------
.../files/samba-4.3.9-remove-rep_strtoull.patch | 22 ++-
net-fs/samba/metadata.xml | 6 -
4 files changed, 94 insertions(+), 101 deletions(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9f1b416..6c09bf8 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,8 +3,8 @@ AUX 4.3/samba4.initd-r1 1110 SHA256 44b53a5d5f516cb944a308613579b3e8e27166519612
AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d WHIRLPOOL 2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256 6cf93d127aa900c1e9a4fb8a3bdff6054d78a7adb798c6f409feffc13c714ee9 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 WHIRLPOOL 882a52598013a40165d87616eaa016139fa89ff218dc43a6e6518123ccc18ca84e4ba275731e10ec762b22f26576eac56ad6b257cfae2e1cbc45f518a0d37007
AUX samba-4.2.7-pam.patch 1273 SHA256 e1abd99fcf4ff721dafa64c77a60b07962e3e818eaf5d10fecead61a2af81e07 SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc WHIRLPOOL 91e1fc2e49944d1ded93d902fc50437763388a12b8c2eab70e2dcd8124860746c71fa8b4c26e7b43e5ebc2c0fc94c4c005a2c1eb8b9af68e77c9c6cc1d92927c
-AUX samba-4.3.9-remove-getpwent_r.patch 2509 SHA256 67cb2991602fb8e7ac24c8ff74840a310c95fac79554792195fd6974d7a5acc6 SHA512 833d7633b1946b7e4a0157cdf781fbba429a9b98e641f48de779fb4a4daccbc10cb9cb4bb09d9e050a27a91e749317dad3bec53a5102ba7787fc222037211c73 WHIRLPOOL c64797ba00e4f57a5c8d5e4a61583f33eee5505b12ba8dee34487a3d2549d8565388d955ee1d73362421c3dee3d4badb9b9afd8b512308c7745371eeaf8c9d57
-AUX samba-4.3.9-remove-rep_strtoull.patch 1391 SHA256 668841dc9f9b18ac7bc9b186bf2f800382fe1073101c8ea45630706e9821540e SHA512 7c4d666673dcc2958773b95edd357f984cfb260be1e9d270d8fd4f7e42ef16697af9e3cc58d534cbc67e37cd4b4fe4bb9e8b24be41201d3fb225eb0eec093c9a WHIRLPOOL 0a7c6e7619a12b8468da9a6449914916232d8ce2cbc66779dc7a590acaf62f8a1196c08b846dbc20c58d6dd145eea36a7d087eaf0a596fbfb82d20d4b22ada0a
+AUX samba-4.3.9-remove-getpwent_r.patch 2680 SHA256 7956274b412a268339abb63f8e1bd63b5049cd4ab7c6270235d9d0b9bcf6c81a SHA512 0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b WHIRLPOOL a42c91049872ca29dfeb80755b7f99fc3ad81b59395fb2d9a77210f18de402a4ef3a0409edfe9339b3b3e7ee7d3c85fed55f90ce50392c5e3ec2fce8c9f3f498
+AUX samba-4.3.9-remove-rep_strtoull.patch 2088 SHA256 a5a6493252f99d89b9c108a51073e777096e82e22f57c3444dc2cd7df36fe152 SHA512 9f264e300e453466e9be86d44dc90eea69ace58c4c1a4f9d6374bffe99dae3f56b529c19509efa39cffebb7e3aaf1edf1a1828d36e3d412d0b9de7d70e71e3e0 WHIRLPOOL a33481e663bcddcf7bc0a936d8e67d84850009cbdccf6c14949a244f939d0ea159502915a2ec2f2ee6e357d2dc4a0856a11796e44f22bbde71ff002597337aa4
AUX samba.conf 61 SHA256 e4fc68bc14a44e3c452e767d996ff693d131da317eb513de10d752dd96cb6f12 SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e WHIRLPOOL ad21bc3738c2ec721ad3be746c66719385390835c7f4da881fc0cc1c982bb6821a56300157b1169d1a35264e44dab1a0c29cd9919455a02a8f4c53c665a4bed3
AUX samba.service 199 SHA256 0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 WHIRLPOOL 1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
AUX smbd.service 250 SHA256 e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3 WHIRLPOOL 18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
@@ -14,4 +14,4 @@ AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288
DIST samba-4.3.9.tar.gz 20570849 SHA256 1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 SHA512 bc90c88d8defd3acec7c671e8ceacec31e3111540aabee7ec6f11cdeaf61bbd993525e2b765e3b50801c8079e1168cf496b3e5e6a56118d6493ae5da60d34c41 WHIRLPOOL e33efba4bfbaab5278ec62cbadb5f14fe2220d4b4ad1e57a4d26233d8b6bdf4318ad86d839b2638a490a195c04aabb02dafff67bb1e2999fab4f116b3c6367cc
DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256 83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512 ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5 WHIRLPOOL 3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
EBUILD samba-4.3.9-r99.ebuild 6784 SHA256 0ced519f1d177f9c82c5c2dca1ebfcdb124d32fb24c1f7f1b8c36af92bb29090 SHA512 4e3723d82ff7e819eb65e0dd32081479cd3e2f75a64977bc7d337aa9d424234cf77a20988415145254c398faa7dd5ce854628ff27a94fc810599271dc1f546df WHIRLPOOL 1565704f0e0b05d0c8a71fb437e03b62789e74f6d4350ef93dc2f5d54060726fef1af818ce920b90c54fd5abe99a1d54ea950e997e51c4d89fa8958bf72c3b0f
-MISC metadata.xml 1714 SHA256 94b726fc2c6f741402a9a6139fd507a9b7b56d0920ae83a095e0e5c416250f3d SHA512 ccf8143ca9c586a5313f8e4d82ae9114ad9685def8b12729804ebd5279ce53e58685cf21257a7fe11f0a40227df5b3987550d4d8f3fde1752310eec3da27ba4f WHIRLPOOL 7c35b3a07535c0e3e9e716a394f06535c343a44dcd4ec49c28460ef337e9d920fc91210f083bf6ca098774369bec065e280ef11f296372242ea94b72b70a9fc2
+MISC metadata.xml 1340 SHA256 7e1194c34c9027273c83730261a6216ebed071fd6d43035fb53d1f4181db4686 SHA512 1c339824f2fcbe5573041699a973fd31355cae24c8d6c8e7779b82da3aef96fba3ed4f8a08e2867ef6a7b77e025253e0f762eadb2b96331e7c57cf3b25a64da4 WHIRLPOOL 5163bf739900fa9fe9b05ddcee07829911cf9b704d42bf246e38111aa90a09f5435fbd4d8058f29e171fa91e64110bb49834af1677ea55b1d2f2789a20740e58
diff --git a/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
index 0b42cbf..99ebeda 100644
--- a/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
+++ b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
@@ -1,101 +1,80 @@
-diff -Naur samba-4.3.9.orig/source4/torture/local/nss_tests.c samba-4.3.9/source4/torture/local/nss_tests.c
---- samba-4.3.9.orig/source4/torture/local/nss_tests.c 2015-12-01 08:42:55.000000000 +0000
-+++ samba-4.3.9/source4/torture/local/nss_tests.c 2016-05-29 00:52:30.412002243 +0000
-@@ -337,48 +337,6 @@
+diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
+index 2cd6122..04f13c6 100644
+--- a/source4/torture/local/nss_tests.c
++++ b/source4/torture/local/nss_tests.c
+@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx,
+ return true;
+ }
+
+-
+ static bool test_getgrgid(struct torture_context *tctx,
+ gid_t gid,
+ struct group *grp_p)
+@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx,
+ return true;
+ }
+
++#if HAVE_GETPWENT_R
+ static bool test_enum_r_passwd(struct torture_context *tctx,
struct passwd **pwd_array_p,
size_t *num_pwd_p)
- {
-- struct passwd pwd, *pwdp;
-- struct passwd *pwd_array = NULL;
-- size_t num_pwd = 0;
-- char buffer[4096];
-- int ret;
--
-- torture_comment(tctx, "Testing setpwent\n");
-- setpwent();
--
-- while (1) {
-- torture_comment(tctx, "Testing getpwent_r\n");
--
--#ifdef SOLARIS_GETPWENT_R
-- ret = getpwent_r(&pwd, buffer, sizeof(buffer));
--#else /* SOLARIS_GETPWENT_R */
-- ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp);
--#endif /* SOLARIS_GETPWENT_R */
-- if (ret != 0) {
-- if (ret != ENOENT) {
-- torture_comment(tctx, "got %d return code\n", ret);
-- }
-- break;
-- }
-- print_passwd(&pwd);
-- if (pwd_array_p && num_pwd_p) {
-- pwd_array = talloc_realloc(tctx, pwd_array, struct passwd, num_pwd+1);
-- torture_assert(tctx, pwd_array, "out of memory");
-- copy_passwd(tctx, &pwd, &pwd_array[num_pwd]);
-- num_pwd++;
-- }
-- }
--
-- torture_comment(tctx, "Testing endpwent\n");
-- endpwent();
--
-- if (pwd_array_p) {
-- *pwd_array_p = pwd_array;
-- }
-- if (num_pwd_p) {
-- *num_pwd_p = num_pwd;
-- }
--
+@@ -381,6 +381,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
+
+ return true;
+ }
++#endif
+
+ static bool torture_assert_passwd_equal(struct torture_context *tctx,
+ const struct passwd *p1,
+@@ -432,7 +433,7 @@ static bool test_passwd_r(struct torture_context *tctx)
+ struct passwd *pwd, pwd1, pwd2;
+ size_t num_pwd;
+
+- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
++ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
+ "failed to enumerate passwd");
+
+ for (i=0; i < num_pwd; i++) {
+@@ -460,7 +461,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
+ struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
+ size_t num_pwd;
+
+- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
++ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
+ "failed to enumerate passwd");
+
+ for (i=0; i < num_pwd; i++) {
+@@ -531,6 +532,7 @@ static bool test_enum_group(struct torture_context *tctx,
return true;
}
-@@ -535,48 +493,6 @@
++#if HAVE_GETGRENT_R
+ static bool test_enum_r_group(struct torture_context *tctx,
struct group **grp_array_p,
size_t *num_grp_p)
- {
-- struct group grp, *grpp;
-- struct group *grp_array = NULL;
-- size_t num_grp = 0;
-- char buffer[4096];
-- int ret;
--
-- torture_comment(tctx, "Testing setgrent\n");
-- setgrent();
--
-- while (1) {
-- torture_comment(tctx, "Testing getgrent_r\n");
--
--#ifdef SOLARIS_GETGRENT_R
-- ret = getgrent_r(&grp, buffer, sizeof(buffer));
--#else /* SOLARIS_GETGRENT_R */
-- ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp);
--#endif /* SOLARIS_GETGRENT_R */
-- if (ret != 0) {
-- if (ret != ENOENT) {
-- torture_comment(tctx, "got %d return code\n", ret);
-- }
-- break;
-- }
-- print_group(&grp);
-- if (grp_array_p && num_grp_p) {
-- grp_array = talloc_realloc(tctx, grp_array, struct group, num_grp+1);
-- torture_assert(tctx, grp_array, "out of memory");
-- copy_group(tctx, &grp, &grp_array[num_grp]);
-- num_grp++;
-- }
-- }
--
-- torture_comment(tctx, "Testing endgrent\n");
-- endgrent();
--
-- if (grp_array_p) {
-- *grp_array_p = grp_array;
-- }
-- if (num_grp_p) {
-- *num_grp_p = num_grp;
-- }
--
+@@ -579,6 +581,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
+
return true;
}
++#endif
+
+ static bool torture_assert_group_equal(struct torture_context *tctx,
+ const struct group *g1,
+@@ -635,7 +638,7 @@ static bool test_group_r(struct torture_context *tctx)
+ struct group *grp, grp1, grp2;
+ size_t num_grp;
+
+- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
++ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
+ "failed to enumerate group");
+
+ for (i=0; i < num_grp; i++) {
+@@ -663,7 +666,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
+ struct group *grp, grp1, grp2, grp3, grp4;
+ size_t num_grp;
+
+- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
++ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
+ "failed to enumerate group");
+ for (i=0; i < num_grp; i++) {
diff --git a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
index 36efd57..9c41454 100644
--- a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
+++ b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
@@ -1,6 +1,6 @@
diff -Naur samba-4.3.9.orig/lib/replace/replace.c samba-4.3.9/lib/replace/replace.c
--- samba-4.3.9.orig/lib/replace/replace.c 2015-09-08 13:45:25.000000000 +0000
-+++ samba-4.3.9/lib/replace/replace.c 2016-05-29 00:50:43.794008282 +0000
++++ samba-4.3.9/lib/replace/replace.c 2016-05-29 06:47:07.529796925 +0000
@@ -558,43 +558,6 @@
#endif /* HAVE_STRTOLL */
@@ -45,3 +45,23 @@ diff -Naur samba-4.3.9.orig/lib/replace/replace.c samba-4.3.9/lib/replace/replac
#ifndef HAVE_SETENV
int rep_setenv(const char *name, const char *value, int overwrite)
{
+diff -Naur samba-4.3.9.orig/lib/replace/replace.h samba-4.3.9/lib/replace/replace.h
+--- samba-4.3.9.orig/lib/replace/replace.h 2015-09-08 13:45:25.000000000 +0000
++++ samba-4.3.9/lib/replace/replace.h 2016-05-29 06:47:28.886795715 +0000
+@@ -371,16 +371,6 @@
+ #endif
+ #endif
+
+-#ifndef HAVE_STRTOULL
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#else
+-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#endif
+-#endif
+-
+ #ifndef HAVE_FTRUNCATE
+ #define ftruncate rep_ftruncate
+ int rep_ftruncate(int,off_t);
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 73d475c..0028eef 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -11,20 +11,14 @@
<use>
<flag name="addc">Enable Active Directory Domain Controller support</flag>
<flag name="ads">Enable Active Directory support</flag>
- <flag name="swat">Enables support for swat configuration gui</flag>
<flag name="winbind">Enables support for the winbind auth daemon</flag>
<flag name="client">Enables the client part</flag>
<flag name="server">Enables the server part</flag>
- <flag name="netapi">Enable building of netapi bits</flag>
<flag name="addns">Enable AD DNS integration</flag>
<flag name="aio">Enable asynchronous IO support</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="ldb">Enable the ldb tools</flag>
<flag name="quota">Enables support for user quotas</flag>
- <flag name="smbclient">Enable smbclient tool</flag>
- <flag name="smbsharemodes">Enable special smb share modes (?) </flag>
- <flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
<pkg>app-crypt/heimdal</pkg>.</flag>
<flag name="iprint">Enabling iPrint technology by Novell</flag>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/
@ 2016-05-29 1:04 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2016-05-29 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 03e7f7f97bce6504b0043c000b9e13a3f11dfeed
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 01:05:55 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 29 01:05:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=03e7f7f9
net-fs/samba: fixed to build on musl
net-fs/samba/Manifest | 4 +-
.../files/samba-4.3.9-remove-getpwent_r.patch | 101 +++++++++++++++++++++
.../files/samba-4.3.9-remove-rep_strtoull.patch | 47 ++++++++++
net-fs/samba/samba-4.3.9-r99.ebuild | 3 +
4 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7f77a4a..bc95999 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,6 +3,8 @@ AUX 4.3/samba4.initd-r1 1110 SHA256 44b53a5d5f516cb944a308613579b3e8e27166519612
AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d WHIRLPOOL 2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256 6cf93d127aa900c1e9a4fb8a3bdff6054d78a7adb798c6f409feffc13c714ee9 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 WHIRLPOOL 882a52598013a40165d87616eaa016139fa89ff218dc43a6e6518123ccc18ca84e4ba275731e10ec762b22f26576eac56ad6b257cfae2e1cbc45f518a0d37007
AUX samba-4.2.7-pam.patch 1273 SHA256 e1abd99fcf4ff721dafa64c77a60b07962e3e818eaf5d10fecead61a2af81e07 SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc WHIRLPOOL 91e1fc2e49944d1ded93d902fc50437763388a12b8c2eab70e2dcd8124860746c71fa8b4c26e7b43e5ebc2c0fc94c4c005a2c1eb8b9af68e77c9c6cc1d92927c
+AUX samba-4.3.9-remove-getpwent_r.patch 2509 SHA256 67cb2991602fb8e7ac24c8ff74840a310c95fac79554792195fd6974d7a5acc6 SHA512 833d7633b1946b7e4a0157cdf781fbba429a9b98e641f48de779fb4a4daccbc10cb9cb4bb09d9e050a27a91e749317dad3bec53a5102ba7787fc222037211c73 WHIRLPOOL c64797ba00e4f57a5c8d5e4a61583f33eee5505b12ba8dee34487a3d2549d8565388d955ee1d73362421c3dee3d4badb9b9afd8b512308c7745371eeaf8c9d57
+AUX samba-4.3.9-remove-rep_strtoull.patch 1391 SHA256 668841dc9f9b18ac7bc9b186bf2f800382fe1073101c8ea45630706e9821540e SHA512 7c4d666673dcc2958773b95edd357f984cfb260be1e9d270d8fd4f7e42ef16697af9e3cc58d534cbc67e37cd4b4fe4bb9e8b24be41201d3fb225eb0eec093c9a WHIRLPOOL 0a7c6e7619a12b8468da9a6449914916232d8ce2cbc66779dc7a590acaf62f8a1196c08b846dbc20c58d6dd145eea36a7d087eaf0a596fbfb82d20d4b22ada0a
AUX samba.conf 61 SHA256 e4fc68bc14a44e3c452e767d996ff693d131da317eb513de10d752dd96cb6f12 SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e WHIRLPOOL ad21bc3738c2ec721ad3be746c66719385390835c7f4da881fc0cc1c982bb6821a56300157b1169d1a35264e44dab1a0c29cd9919455a02a8f4c53c665a4bed3
AUX samba.service 199 SHA256 0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 WHIRLPOOL 1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
AUX smbd.service 250 SHA256 e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3 WHIRLPOOL 18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
@@ -11,5 +13,5 @@ AUX smbd_at.service 145 SHA256 909dddfd80982035739081d86d2c524f6a25440d9c10b8a80
AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7 WHIRLPOOL eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268
DIST samba-4.3.9.tar.gz 20570849 SHA256 1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 SHA512 bc90c88d8defd3acec7c671e8ceacec31e3111540aabee7ec6f11cdeaf61bbd993525e2b765e3b50801c8079e1168cf496b3e5e6a56118d6493ae5da60d34c41 WHIRLPOOL e33efba4bfbaab5278ec62cbadb5f14fe2220d4b4ad1e57a4d26233d8b6bdf4318ad86d839b2638a490a195c04aabb02dafff67bb1e2999fab4f116b3c6367cc
DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256 83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512 ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5 WHIRLPOOL 3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
-EBUILD samba-4.3.9-r99.ebuild 6684 SHA256 9cc9763e58a0b6cf537287eefd98b1ad0ef33106ab3f61e4398141f4fe644d0f SHA512 00764d3a3ec15f0e47e4d3ed9e83fdc665ffc685b93ab58798c0eb920d7f067cdec99037b7641b4a7d28ffd4b9d6e6ea1a07df83f9f2f479456327ac18c4f9a9 WHIRLPOOL 70e120156cd09100b1c930f94d89aa09a53b256e04641d0ee089abd31cb64cf6fd9b86c1a08f270e1196eb82fb9d4597bc75d64277a695f43564d3e1bdd03970
+EBUILD samba-4.3.9-r99.ebuild 6775 SHA256 625f16e16a0883b1f1d0808c909767432e831895ae708598219529840c287a67 SHA512 331b2ea18101aae2416caef82c2be925bbb1eb316bf0ed9b7c67fb683399f59c795d25edbba8d0ada26ce643033a74a2cde1ac9461b01775e8a8a19b82ed116b WHIRLPOOL a8e1d42cc92ffa6ce1d3615af367d3765020f05997e118af701b19064d7f18dfdaac626d355f3b1cdf0dcd45ec642e77f40ba4e1ec5a81f7f1980ff969da5dc7
MISC metadata.xml 1714 SHA256 94b726fc2c6f741402a9a6139fd507a9b7b56d0920ae83a095e0e5c416250f3d SHA512 ccf8143ca9c586a5313f8e4d82ae9114ad9685def8b12729804ebd5279ce53e58685cf21257a7fe11f0a40227df5b3987550d4d8f3fde1752310eec3da27ba4f WHIRLPOOL 7c35b3a07535c0e3e9e716a394f06535c343a44dcd4ec49c28460ef337e9d920fc91210f083bf6ca098774369bec065e280ef11f296372242ea94b72b70a9fc2
diff --git a/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
new file mode 100644
index 0000000..0b42cbf
--- /dev/null
+++ b/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
@@ -0,0 +1,101 @@
+diff -Naur samba-4.3.9.orig/source4/torture/local/nss_tests.c samba-4.3.9/source4/torture/local/nss_tests.c
+--- samba-4.3.9.orig/source4/torture/local/nss_tests.c 2015-12-01 08:42:55.000000000 +0000
++++ samba-4.3.9/source4/torture/local/nss_tests.c 2016-05-29 00:52:30.412002243 +0000
+@@ -337,48 +337,6 @@
+ struct passwd **pwd_array_p,
+ size_t *num_pwd_p)
+ {
+- struct passwd pwd, *pwdp;
+- struct passwd *pwd_array = NULL;
+- size_t num_pwd = 0;
+- char buffer[4096];
+- int ret;
+-
+- torture_comment(tctx, "Testing setpwent\n");
+- setpwent();
+-
+- while (1) {
+- torture_comment(tctx, "Testing getpwent_r\n");
+-
+-#ifdef SOLARIS_GETPWENT_R
+- ret = getpwent_r(&pwd, buffer, sizeof(buffer));
+-#else /* SOLARIS_GETPWENT_R */
+- ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp);
+-#endif /* SOLARIS_GETPWENT_R */
+- if (ret != 0) {
+- if (ret != ENOENT) {
+- torture_comment(tctx, "got %d return code\n", ret);
+- }
+- break;
+- }
+- print_passwd(&pwd);
+- if (pwd_array_p && num_pwd_p) {
+- pwd_array = talloc_realloc(tctx, pwd_array, struct passwd, num_pwd+1);
+- torture_assert(tctx, pwd_array, "out of memory");
+- copy_passwd(tctx, &pwd, &pwd_array[num_pwd]);
+- num_pwd++;
+- }
+- }
+-
+- torture_comment(tctx, "Testing endpwent\n");
+- endpwent();
+-
+- if (pwd_array_p) {
+- *pwd_array_p = pwd_array;
+- }
+- if (num_pwd_p) {
+- *num_pwd_p = num_pwd;
+- }
+-
+ return true;
+ }
+
+@@ -535,48 +493,6 @@
+ struct group **grp_array_p,
+ size_t *num_grp_p)
+ {
+- struct group grp, *grpp;
+- struct group *grp_array = NULL;
+- size_t num_grp = 0;
+- char buffer[4096];
+- int ret;
+-
+- torture_comment(tctx, "Testing setgrent\n");
+- setgrent();
+-
+- while (1) {
+- torture_comment(tctx, "Testing getgrent_r\n");
+-
+-#ifdef SOLARIS_GETGRENT_R
+- ret = getgrent_r(&grp, buffer, sizeof(buffer));
+-#else /* SOLARIS_GETGRENT_R */
+- ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp);
+-#endif /* SOLARIS_GETGRENT_R */
+- if (ret != 0) {
+- if (ret != ENOENT) {
+- torture_comment(tctx, "got %d return code\n", ret);
+- }
+- break;
+- }
+- print_group(&grp);
+- if (grp_array_p && num_grp_p) {
+- grp_array = talloc_realloc(tctx, grp_array, struct group, num_grp+1);
+- torture_assert(tctx, grp_array, "out of memory");
+- copy_group(tctx, &grp, &grp_array[num_grp]);
+- num_grp++;
+- }
+- }
+-
+- torture_comment(tctx, "Testing endgrent\n");
+- endgrent();
+-
+- if (grp_array_p) {
+- *grp_array_p = grp_array;
+- }
+- if (num_grp_p) {
+- *num_grp_p = num_grp;
+- }
+-
+ return true;
+ }
+
diff --git a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
new file mode 100644
index 0000000..36efd57
--- /dev/null
+++ b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
@@ -0,0 +1,47 @@
+diff -Naur samba-4.3.9.orig/lib/replace/replace.c samba-4.3.9/lib/replace/replace.c
+--- samba-4.3.9.orig/lib/replace/replace.c 2015-09-08 13:45:25.000000000 +0000
++++ samba-4.3.9/lib/replace/replace.c 2016-05-29 00:50:43.794008282 +0000
+@@ -558,43 +558,6 @@
+ #endif /* HAVE_STRTOLL */
+
+
+-#ifndef HAVE_STRTOULL
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+-#ifdef HAVE_STRTOUQ
+- return strtouq(str, endptr, base);
+-#elif defined(HAVE___STRTOULL)
+- return __strtoull(str, endptr, base);
+-#elif SIZEOF_LONG == SIZEOF_LONG_LONG
+- return (unsigned long long int) strtoul(str, endptr, base);
+-#else
+-# error "You need a strtoull function"
+-#endif
+-}
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#ifdef HAVE_STRTOUQ
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+- unsigned long long int nb = strtouq(str, endptr, base);
+- /* In linux EINVAL is only returned if base is not ok */
+- if (errno == EINVAL) {
+- if (base == 0 || (base >1 && base <37)) {
+- /* Base was ok so it's because we were not
+- * able to make the convertion.
+- * Let's reset errno.
+- */
+- errno = 0;
+- }
+- }
+- return nb;
+-}
+-#else
+-#error "You need the strtouq function"
+-#endif /* HAVE_STRTOUQ */
+-#endif /* HAVE_BSD_STRTOLL */
+-#endif /* HAVE_STRTOULL */
+-
+ #ifndef HAVE_SETENV
+ int rep_setenv(const char *name, const char *value, int overwrite)
+ {
diff --git a/net-fs/samba/samba-4.3.9-r99.ebuild b/net-fs/samba/samba-4.3.9-r99.ebuild
index f58f54d..081c540 100644
--- a/net-fs/samba/samba-4.3.9-r99.ebuild
+++ b/net-fs/samba/samba-4.3.9-r99.ebuild
@@ -88,6 +88,9 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
"${FILESDIR}/${PN}-4.2.7-pam.patch"
+ "${FILESDIR}/${P}-remove-getpwent_r.patch"
+ "${FILESDIR}/${P}-remove-rep_strtoull.patch"
+
)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-19 17:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-07 12:19 [gentoo-commits] proj/musl:master commit in: net-fs/samba/, net-fs/samba/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2022-07-19 17:35 Anthony G. Basile
2020-06-22 16:49 Anthony G. Basile
2016-05-29 16:46 Anthony G. Basile
2016-05-29 1:04 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox